diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php index b120ae2fae4..d50d8c5009b 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Entity/NonStrictReadWriteCachedEntityPersister.php @@ -78,9 +78,13 @@ public function afterTransactionRolledBack() */ public function delete($entity) { - $this->persister->delete($entity); + $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity)); - $this->queuedCache['delete'][] = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity)); + if ($this->persister->delete($entity)) { + $this->region->evict($key); + } + + $this->queuedCache['delete'][] = $key; } /** diff --git a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php index 0f65e4c9bfa..0d0a1af9d9e 100644 --- a/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersister.php @@ -103,7 +103,9 @@ public function delete($entity) $key = new EntityCacheKey($this->class->rootEntityName, $this->uow->getEntityIdentifier($entity)); $lock = $this->region->lock($key); - $this->persister->delete($entity); + if ($this->persister->delete($entity)) { + $this->region->evict($key); + } if ($lock === null) { return; diff --git a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php index 9dc2fad548d..c18fdbbb9f1 100644 --- a/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/Collection/OneToManyPersister.php @@ -157,27 +157,21 @@ public function contains(PersistentCollection $collection, $element) */ public function removeElement(PersistentCollection $collection, $element) { - if ( ! $this->isValidEntityState($element)) { + $mapping = $collection->getMapping(); + + if ( ! $mapping['orphanRemoval']) { + // no-op: this is not the owning side, therefore no operations should be applied return false; } - $mapping = $collection->getMapping(); - $persister = $this->uow->getEntityPersister($mapping['targetEntity']); - - $targetMetadata = $this->em->getClassMetadata($mapping['targetEntity']); - - if ($element instanceof Proxy && ! $element->__isInitialized()) { - $element->__load(); + if ( ! $this->isValidEntityState($element)) { + return false; } - // clearing owning side value - $targetMetadata->reflFields[$mapping['mappedBy']]->setValue($element, null); - - $this->uow->computeChangeSet($targetMetadata, $element); - - $persister->update($element); - - return true; + return $this + ->uow + ->getEntityPersister($mapping['targetEntity']) + ->delete($element); } /** diff --git a/tests/Doctrine/Tests/Models/Tweet/User.php b/tests/Doctrine/Tests/Models/Tweet/User.php index 4722e63176b..68cf137f2b0 100644 --- a/tests/Doctrine/Tests/Models/Tweet/User.php +++ b/tests/Doctrine/Tests/Models/Tweet/User.php @@ -29,9 +29,15 @@ class User */ public $tweets; + /** + * @OneToMany(targetEntity="UserList", mappedBy="owner", fetch="EXTRA_LAZY", orphanRemoval=true) + */ + public $userLists; + public function __construct() { - $this->tweets = new ArrayCollection(); + $this->tweets = new ArrayCollection(); + $this->userLists = new ArrayCollection(); } public function addTweet(Tweet $tweet) @@ -39,4 +45,10 @@ public function addTweet(Tweet $tweet) $tweet->setAuthor($this); $this->tweets->add($tweet); } + + public function addUserList(UserList $userList) + { + $userList->owner = $this; + $this->userLists->add($userList); + } } diff --git a/tests/Doctrine/Tests/Models/Tweet/UserList.php b/tests/Doctrine/Tests/Models/Tweet/UserList.php new file mode 100644 index 00000000000..1eb3e141f03 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Tweet/UserList.php @@ -0,0 +1,29 @@ +articles->removeElement($article); $this->assertFalse($user->articles->isInitialized(), "Post-Condition: Collection is not initialized."); - // NOTE: +2 queries because CmsArticle is a versioned entity, and that needs to be handled accordingly - $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount()); + $this->assertEquals($queryCount, $this->getCurrentQueryCount()); // Test One to Many removal with Entity state as new $article = new \Doctrine\Tests\Models\CMS\CmsArticle(); @@ -528,22 +528,37 @@ public function testRemoveElementOneToMany() */ public function testRemovalOfManagedElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { + /* @var $otherClass DDC2504OtherClass */ $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); + /* @var $childClass DDC2504ChildClass */ $childClass = $this->_em->find(DDC2504ChildClass::CLASSNAME, $this->ddc2504ChildClassId); $queryCount = $this->getCurrentQueryCount(); $otherClass->childClasses->removeElement($childClass); + $childClass->other = null; // updating owning side $this->assertFalse($otherClass->childClasses->isInitialized(), 'Collection is not initialized.'); $this->assertEquals( - $queryCount + 1, + $queryCount, $this->getCurrentQueryCount(), - 'The owning side of the association is updated' + 'No queries have been executed' ); - $this->assertFalse($otherClass->childClasses->contains($childClass)); + $this->assertTrue( + $otherClass->childClasses->contains($childClass), + 'Collection item still not updated (needs flushing)' + ); + + $this->_em->flush(); + + $this->assertFalse( + $otherClass->childClasses->contains($childClass), + 'Referenced item was removed in the transaction' + ); + + $this->assertFalse($otherClass->childClasses->isInitialized(), 'Collection is not initialized.'); } /** @@ -551,6 +566,7 @@ public function testRemovalOfManagedElementFromOneToManyJoinedInheritanceCollect */ public function testRemovalOfNonManagedElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { + /* @var $otherClass DDC2504OtherClass */ $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); $queryCount = $this->getCurrentQueryCount(); @@ -568,6 +584,7 @@ public function testRemovalOfNonManagedElementFromOneToManyJoinedInheritanceColl */ public function testRemovalOfNewElementFromOneToManyJoinedInheritanceCollectionDoesNotInitializeIt() { + /* @var $otherClass DDC2504OtherClass */ $otherClass = $this->_em->find(DDC2504OtherClass::CLASSNAME, $this->ddc2504OtherClassId); $childClass = new DDC2504ChildClass(); @@ -1035,7 +1052,7 @@ private function loadFixture() /** * @group DDC-3343 */ - public function testRemovesManagedElementFromOneToManyExtraLazyCollection() + public function testRemoveManagedElementFromOneToManyExtraLazyCollectionIsNoOp() { list($userId, $tweetId) = $this->loadTweetFixture(); @@ -1049,22 +1066,21 @@ public function testRemovesManagedElementFromOneToManyExtraLazyCollection() /* @var $user User */ $user = $this->_em->find(User::CLASSNAME, $userId); - $this->assertCount(0, $user->tweets); + $this->assertCount(1, $user->tweets, 'Element was not removed - need to update the owning side first'); } /** * @group DDC-3343 */ - public function testRemovesManagedElementFromOneToManyExtraLazyCollectionWithoutDeletingTheTargetEntityEntry() + public function testRemoveManagedElementFromOneToManyExtraLazyCollectionWithoutDeletingTheTargetEntityEntryIsNoOp() { list($userId, $tweetId) = $this->loadTweetFixture(); /* @var $user User */ $user = $this->_em->find(User::CLASSNAME, $userId); + $tweet = $this->_em->find(Tweet::CLASSNAME, $tweetId); - $e = $this->_em->find(Tweet::CLASSNAME, $tweetId); - - $user->tweets->removeElement($e); + $user->tweets->removeElement($tweet); $this->_em->clear(); @@ -1076,7 +1092,11 @@ public function testRemovesManagedElementFromOneToManyExtraLazyCollectionWithout 'Even though the collection is extra lazy, the tweet should not have been deleted' ); - $this->assertNull($tweet->author, 'Tweet author link has been removed'); + $this->assertInstanceOf( + User::CLASSNAME, + $tweet->author, + 'Tweet author link has not been removed - need to update the owning side first' + ); } /** @@ -1102,12 +1122,89 @@ public function testRemovingManagedLazyProxyFromExtraLazyOneToManyDoesRemoveTheA 'Even though the collection is extra lazy, the tweet should not have been deleted' ); - $this->assertNull($tweet->author); + $this->assertInstanceOf(User::CLASSNAME, $tweet->author); + + /* @var $user User */ + $user = $this->_em->find(User::CLASSNAME, $userId); + + $this->assertCount(1, $user->tweets, 'Element was not removed - need to update the owning side first'); + } + + /** + * @group DDC-3343 + */ + public function testRemoveOrphanedManagedElementFromOneToManyExtraLazyCollection() + { + list($userId, $userListId) = $this->loadUserListFixture(); + + /* @var $user User */ + $user = $this->_em->find(User::CLASSNAME, $userId); + + $user->userLists->removeElement($this->_em->find(UserList::CLASSNAME, $userListId)); + + $this->_em->clear(); /* @var $user User */ $user = $this->_em->find(User::CLASSNAME, $userId); - $this->assertCount(0, $user->tweets); + $this->assertCount(0, $user->userLists, 'Element was removed from association due to orphan removal'); + $this->assertNull( + $this->_em->find(UserList::CLASSNAME, $userListId), + 'Element was deleted due to orphan removal' + ); + } + + /** + * @group DDC-3343 + */ + public function testRemoveOrphanedUnManagedElementFromOneToManyExtraLazyCollection() + { + list($userId, $userListId) = $this->loadUserListFixture(); + + /* @var $user User */ + $user = $this->_em->find(User::CLASSNAME, $userId); + + $user->userLists->removeElement(new UserList()); + + $this->_em->clear(); + + /* @var $userList UserList */ + $userList = $this->_em->find(UserList::CLASSNAME, $userListId); + $this->assertInstanceOf( + UserList::CLASSNAME, + $userList, + 'Even though the collection is extra lazy + orphan removal, the user list should not have been deleted' + ); + + $this->assertInstanceOf( + User::CLASSNAME, + $userList->owner, + 'User list to owner link has not been removed' + ); + } + + /** + * @group DDC-3343 + */ + public function testRemoveOrphanedManagedLazyProxyFromExtraLazyOneToMany() + { + list($userId, $userListId) = $this->loadUserListFixture(); + + /* @var $user User */ + $user = $this->_em->find(User::CLASSNAME, $userId); + + $user->userLists->removeElement($this->_em->getReference(UserList::CLASSNAME, $userListId)); + + $this->_em->clear(); + + /* @var $user User */ + $user = $this->_em->find(User::CLASSNAME, $userId); + + $this->assertCount(0, $user->userLists, 'Element was removed from association due to orphan removal'); + $this->assertNull( + $this->_em->find(UserList::CLASSNAME, $userListId), + 'Element was deleted due to orphan removal' + ); } /** @@ -1130,4 +1227,25 @@ private function loadTweetFixture() return array($user->id, $tweet->id); } + + /** + * @return int[] ordered tuple: user id and user list id + */ + private function loadUserListFixture() + { + $user = new User(); + $userList = new UserList(); + + $user->name = 'ocramius'; + $userList->listName = 'PHP Developers to follow closely'; + + $user->addUserList($userList); + + $this->_em->persist($user); + $this->_em->persist($userList); + $this->_em->flush(); + $this->_em->clear(); + + return array($user->id, $userList->id); + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php index 37dadd26ce7..56735840a4a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheTest.php @@ -296,10 +296,12 @@ public function testPostRemoveFailure() $this->_em->clear(); - $this->assertTrue($this->cache->containsEntity(Country::CLASSNAME, $countryId)); + $this->assertFalse( + $this->cache->containsEntity(Country::CLASSNAME, $countryId), + 'Removal attempts should clear the cache entry corresponding to the entity' + ); - $country = $this->_em->find(Country::CLASSNAME, $countryId); - $this->assertInstanceOf(Country::CLASSNAME, $country); + $this->assertInstanceOf(Country::CLASSNAME, $this->_em->find(Country::CLASSNAME, $countryId)); } public function testCachedNewEntityExists() diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index f73ac54fcc8..fedeed734bd 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -186,7 +186,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ), 'tweet' => array( 'Doctrine\Tests\Models\Tweet\User', - 'Doctrine\Tests\Models\Tweet\Tweet' + 'Doctrine\Tests\Models\Tweet\Tweet', + 'Doctrine\Tests\Models\Tweet\UserList', ), 'ddc2504' => array( 'Doctrine\Tests\Models\DDC2504\DDC2504RootClass', @@ -387,6 +388,12 @@ protected function tearDown() $conn->executeUpdate('DELETE FROM taxi_driver'); } + if (isset($this->_usedModelSets['tweet'])) { + $conn->executeUpdate('DELETE FROM tweet_tweet'); + $conn->executeUpdate('DELETE FROM tweet_user_list'); + $conn->executeUpdate('DELETE FROM tweet_user'); + } + if (isset($this->_usedModelSets['cache'])) { $conn->executeUpdate('DELETE FROM cache_attraction_location_info'); $conn->executeUpdate('DELETE FROM cache_attraction_contact_info');