RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-3068 EntityManager clear() calls now follow cascade detach configuration.

Browse source
This commit is contained in:
Guilherme Blanco 2014-04-16 04:47:57 +00:00
parent 5ce6dabe9b
commit 1cd0b26a40
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
UPGRADE.md
View file

@ -1,5 +1,13 @@
# Upgrade to 2.5 # Upgrade to 2.5
## Minor BC BREAK: Entity based ``EntityManager#clear()`` calls follow cascade detach
Whenever ``EntityManager#clear()`` method gets called with a given entity class
name, until 2.4, it was only detaching the specific requested entity.
As of 2.5, ``EntityManager`` will follow configured cascades, providing a better
memory management since associations will be garbage collected, optimizing
resources consumption on long running jobs.
## BC BREAK: NamingStrategy has a new method ``embeddedFieldToColumnName($propertyName, $embeddedColumnName)`` ## BC BREAK: NamingStrategy has a new method ``embeddedFieldToColumnName($propertyName, $embeddedColumnName)``
This method generates the column name for fields of embedded objects. If you implement your custom NamingStrategy, you This method generates the column name for fields of embedded objects. If you implement your custom NamingStrategy, you

11
lib/Doctrine/ORM/UnitOfWork.php
View file

@ -2403,11 +2403,14 @@ class UnitOfWork implements PropertyChangedListener
} }
} else { } else {
$visited = array(); $visited = array();
foreach ($this->identityMap as $className => $entities) { foreach ($this->identityMap as $className => $entities) {
if ($className === $entityName) { if ($className !== $entityName) {
foreach ($entities as $entity) { continue;
$this->doDetach($entity, $visited, true); }
}
foreach ($entities as $entity) {
$this->doDetach($entity, $visited, false);
} }
} }
} }

5
tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php
View file

@ -1044,10 +1044,9 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser'); $this->_em->clear('Doctrine\Tests\Models\CMS\CmsUser');
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user)); $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($user));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article1));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_DETACHED, $unitOfWork->getEntityState($article2));
$this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $unitOfWork->getEntityState($address)); $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->_em->clear();