Fix handling of upserts during scheduling for deletion (#2334)

* Fix handling of upserts during scheduling for deletion * Added test
doctrine · Jun 29, 2021 · f20b3cd · f20b3cd
1 parent 5aa06c0
commit f20b3cd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -1357,6 +1357,10 @@ public function scheduleForDelete(object $document, bool $isView = false): void
             unset($this->documentUpdates[$oid]);
         }
 
+        if (isset($this->documentUpserts[$oid])) {
+            unset($this->documentUpserts[$oid]);
+        }
+
         if (isset($this->documentDeletions[$oid])) {
             return;
         }

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php b/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
@@ -116,6 +116,24 @@ public function testRegisterRemovedOnNewEntityIsIgnored()
         $this->assertFalse($this->uow->isScheduledForDelete($user));
     }
 
+    public function testScheduleForDeleteShouldUnregisterScheduledUpserts()
+    {
+        $class    = $this->dm->getClassMetadata(ForumUser::class);
+        $user     = new ForumUser();
+        $user->id = new ObjectId();
+        $this->assertFalse($this->uow->isScheduledForInsert($user));
+        $this->assertFalse($this->uow->isScheduledForUpsert($user));
+        $this->assertFalse($this->uow->isScheduledForDelete($user));
+        $this->uow->scheduleForUpsert($class, $user);
+        $this->assertFalse($this->uow->isScheduledForInsert($user));
+        $this->assertTrue($this->uow->isScheduledForUpsert($user));
+        $this->assertFalse($this->uow->isScheduledForDelete($user));
+        $this->uow->scheduleForDelete($user);
+        $this->assertFalse($this->uow->isScheduledForInsert($user));
+        $this->assertFalse($this->uow->isScheduledForUpsert($user));
+        $this->assertTrue($this->uow->isScheduledForDelete($user));
+    }
+
     public function testThrowsOnPersistOfMappedSuperclass()
     {
         $this->expectException(MongoDBException::class);