RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-21 14:43:14 +03:00
Code Issues Projects Releases Wiki Activity

DDC-1278 - EntityManager::clear($entity) support

Browse Source 
added test case and modified test data CmsUser to cascade detach address and articles (testing collections and single entites)
This commit is contained in:
Dominik Liebler 2011-08-14 16:12:12 +02:00
parent 25f5ff0ca1
commit 6e47d7b16d
3 changed files with 62 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Doctrine/ORM/UnitOfWork.php
View File

@ -1515,9 +1515,9 @@ class UnitOfWork implements PropertyChangedListener
* *
* @param object $entity * @param object $entity
* @param array $visited * @param array $visited
* @param string $entityName detach only entities of this type when given * @param boolean $noCascade if true, don't cascade detach operation
*/ */
private function doDetach($entity, array &$visited, $entityName = null) private function doDetach($entity, array &$visited, $noCascade = false)
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if (isset($visited[$oid])) { if (isset($visited[$oid])) {
@ -1539,8 +1539,10 @@ class UnitOfWork implements PropertyChangedListener
case self::STATE_DETACHED: case self::STATE_DETACHED:
return; return;
} }
$this->cascadeDetach($entity, $visited, $entityName); if (!$noCascade) {
$this->cascadeDetach($entity, $visited);
}
} }
/** /**
@ -1618,9 +1620,8 @@ class UnitOfWork implements PropertyChangedListener
* *
* @param object $entity * @param object $entity
* @param array $visited * @param array $visited
* @param string $entityName detach only entities of this type when given
*/ */
private function cascadeDetach($entity, array &$visited, $entityName = null) private function cascadeDetach($entity, array &$visited)
{ {
$class = $this->em->getClassMetadata(get_class($entity)); $class = $this->em->getClassMetadata(get_class($entity));
foreach ($class->associationMappings as $assoc) { foreach ($class->associationMappings as $assoc) {
@ -1634,14 +1635,10 @@ class UnitOfWork implements PropertyChangedListener
$relatedEntities = $relatedEntities->unwrap(); $relatedEntities = $relatedEntities->unwrap();
} }
foreach ($relatedEntities as $relatedEntity) { foreach ($relatedEntities as $relatedEntity) {
if ($entityName === null || get_class($relatedEntity) == $entityName) { $this->doDetach($relatedEntity, $visited);
$this->doDetach($relatedEntity, $visited, $entityName);
}
} }
} else if ($relatedEntities !== null) { } else if ($relatedEntities !== null) {
if ($entityName === null || get_class($relatedEntities) == $entityName) { $this->doDetach($relatedEntities, $visited);
$this->doDetach($relatedEntities, $visited, $entityName);
}
} }
} }
} }
@ -1823,7 +1820,7 @@ class UnitOfWork implements PropertyChangedListener
foreach ($this->identityMap as $className => $entities) { foreach ($this->identityMap as $className => $entities) {
if ($className === $entityName) { if ($className === $entityName) {
foreach ($entities as $entity) { foreach ($entities as $entity) {
$this->doDetach($entity, $visited, $entityName); $this->doDetach($entity, $visited, true);
} }
} }
} }

4
tests/Doctrine/Tests/Models/CMS/CmsUser.php
View File

@ -35,7 +35,7 @@ class CmsUser
*/ */
public $phonenumbers; public $phonenumbers;
/** /**
* @OneToMany(targetEntity="CmsArticle", mappedBy="user") * @OneToMany(targetEntity="CmsArticle", mappedBy="user", cascade={"detach"})
*/ */
public $articles; public $articles;
/** /**
@ -43,7 +43,7 @@ class CmsUser
*/ */
public $address; public $address;
/** /**
* @ManyToMany(targetEntity="CmsGroup", inversedBy="users", cascade={"persist", "merge"}) * @ManyToMany(targetEntity="CmsGroup", inversedBy="users", cascade={"persist", "merge", "detach"})
* @JoinTable(name="cms_users_groups", * @JoinTable(name="cms_users_groups",
* joinColumns={@JoinColumn(name="user_id", referencedColumnName="id")}, * joinColumns={@JoinColumn(name="user_id", referencedColumnName="id")},
* inverseJoinColumns={@JoinColumn(name="group_id", referencedColumnName="id")} * inverseJoinColumns={@JoinColumn(name="group_id", referencedColumnName="id")}

50
tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
View File

@ -981,4 +981,54 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertTrue($article->user->__isInitialized__, "...but its initialized!"); $this->assertTrue($article->user->__isInitialized__, "...but its initialized!");
$this->assertEquals($qc+2, $this->getCurrentQueryCount()); $this->assertEquals($qc+2, $this->getCurrentQueryCount());
} }
/**
* @group DDC-1278
*/
public function testClearWithEntityName()
{
$user = new CmsUser;
$user->name = 'Dominik';
$user->username = 'domnikl';
$user->status = 'developer';
$address = new CmsAddress();
$address->city = "Springfield";
$address->zip = "12354";
$address->country = "Germany";
$address->street = "Foo Street";
$address->user = $user;
$user->address = $address;
$article1 = new CmsArticle();
$article1->topic = 'Foo';
$article1->text = 'Foo Text';
$article2 = new CmsArticle();
$article2->topic = 'Bar';
$article2->text = 'Bar Text';
$user->addArticle($article1);
$user->addArticle($article2);
$this->_em->persist($article1);
$this->_em->persist($article2);
$this->_em->persist($address);
$this->_em->persist($user);
$this->_em->flush();
$unitOfWork = $this->_em->getUnitOfWork();
$this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser');
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($article1));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($article2));
$this->_em->clear();
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($address));
}
} }