Committing a single document keeps the change sets of the rest of the…

… documents with NOTIFY change tracking
doctrine · Oct 29, 2015 · 434045a · 434045a
1 parent cb01a38
commit 434045a
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 3 deletions.
diff --git a/lib/Doctrine/ODM/MongoDB/UnitOfWork.php b/lib/Doctrine/ODM/MongoDB/UnitOfWork.php
@@ -441,13 +441,32 @@ public function commit($document = null, array $options = array())
         $this->documentUpserts =
         $this->documentUpdates =
         $this->documentDeletions =
-        $this->documentChangeSets =
         $this->collectionUpdates =
         $this->collectionDeletions =
         $this->visitedCollections =
-        $this->scheduledForDirtyCheck =
-        $this->orphanRemovals = 
+        $this->orphanRemovals =
         $this->hasScheduledCollections = array();
+
+        // if not the whole unit of work is committed,
+        // then don't remove all the change sets
+        if (is_object($document)) {
+            $class = $this->dm->getClassMetadata(get_class($document));
+            $oid   = spl_object_hash($document);
+
+            unset($this->documentChangeSets[$oid]);
+            unset($this->scheduledForDirtyCheck[$class->name][$oid]);
+        } elseif (is_array($document)) {
+            foreach ($document as $object) {
+                $class = $this->dm->getClassMetadata(get_class($object));
+                $oid   = spl_object_hash($object);
+
+                unset($this->documentChangeSets[$oid]);
+                unset($this->scheduledForDirtyCheck[$class->name][$oid]);
+            }
+        } else {
+            $this->documentChangeSets     = array();
+            $this->scheduledForDirtyCheck = array();
+        }
     }
 
     /**

diff --git a/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php b/tests/Doctrine/ODM/MongoDB/Tests/UnitOfWorkTest.php
@@ -240,6 +240,48 @@ public function testChangeTrackingNotify()
         $this->assertTrue($updates[0] === $item);
     }
 
+    public function testChangeTrackingNotifyWithMultipleDocuments()
+    {
+        // Preparations
+        $pb = $this->getMockPersistenceBuilder();
+
+        $class = $this->dm->getClassMetadata('Doctrine\ODM\MongoDB\Tests\NotifyChangedDocument');
+        $persister = $this->getMockDocumentPersister($pb, $class);
+        $this->uow->setDocumentPersister($class->name, $persister);
+
+        $entityA = new NotifyChangedDocument();
+        $entityA->setId(2);
+        $entityA->setData('A');
+        $this->uow->persist($entityA);
+
+        $entityB = new NotifyChangedDocument();
+        $entityB->setId(3);
+        $entityB->setData('B');
+        $this->uow->persist($entityB);
+
+        $this->uow->commit();
+
+        // Update both entities
+        $persister->reset();
+        $entityA->setData('A2');
+        $entityB->setData('B2');
+
+        // Committing $entityA should only update $entityA.
+        $this->uow->commit($entityA);
+        $updates = $persister->getUpdates();
+        $this->assertEquals(1, count($updates));
+        $this->assertEquals($updates[0], $entityA);
+        $this->assertTrue($this->uow->isScheduledForDirtyCheck($entityB));
+
+        // Committing the whole UnitOfWork should now also update $entityB.
+        $this->uow->commit();
+        $updates = $persister->getUpdates();
+        $this->assertEquals(2, count($persister->getUpdates()));
+        $this->assertEquals($updates[0], $entityA);
+        $this->assertEquals($updates[1], $entityB);
+        $this->assertFalse($this->uow->isScheduledForDirtyCheck($entityB));
+    }
+
     public function testDoubleCommitWithChangeTrackingNotify()
     {
         $pb = $this->getMockPersistenceBuilder();