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-1278 - EntityManager::clear($entity) support

Browse source 
added new parameter $entityName for UnitOfWork::clear()
removed not implemented exception in EntityManager:clear()
This commit is contained in:
Dominik Liebler 2011-08-11 23:03:26 +02:00
parent e13720c33d
commit 05fb0b913a
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/EntityManager.php
View file

@ -421,16 +421,11 @@ class EntityManager implements ObjectManager
* Clears the EntityManager. All entities that are currently managed * Clears the EntityManager. All entities that are currently managed
* by this EntityManager become detached. * by this EntityManager become detached.
* *
* @param string $entityName * @param string $entityName if given, only entities of this type will get detached
*/ */
public function clear($entityName = null) public function clear($entityName = null)
{ {
if ($entityName === null) { $this->unitOfWork->clear($entityName);
$this->unitOfWork->clear();
} else {
//TODO
throw new ORMException("EntityManager#clear(\$entityName) not yet implemented.");
}
} }
/** /**

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

@ -1790,28 +1790,41 @@ class UnitOfWork implements PropertyChangedListener
/** /**
* Clears the UnitOfWork. * Clears the UnitOfWork.
*
* @param strin $entityName if given, only entities of this type will get detached
*/ */
public function clear() public function clear($entityName = null)
{ {
$this->identityMap = if ($entityName === null) {
$this->entityIdentifiers = $this->identityMap =
$this->originalEntityData = $this->entityIdentifiers =
$this->entityChangeSets = $this->originalEntityData =
$this->entityStates = $this->entityChangeSets =
$this->scheduledForDirtyCheck = $this->entityStates =
$this->entityInsertions = $this->scheduledForDirtyCheck =
$this->entityUpdates = $this->entityInsertions =
$this->entityDeletions = $this->entityUpdates =
$this->collectionDeletions = $this->entityDeletions =
$this->collectionUpdates = $this->collectionDeletions =
$this->extraUpdates = $this->collectionUpdates =
$this->orphanRemovals = array(); $this->extraUpdates =
if ($this->commitOrderCalculator !== null) { $this->orphanRemovals = array();
$this->commitOrderCalculator->clear(); if ($this->commitOrderCalculator !== null) {
} $this->commitOrderCalculator->clear();
}
if ($this->evm->hasListeners(Events::onClear)) { if ($this->evm->hasListeners(Events::onClear)) {
$this->evm->dispatchEvent(Events::onClear, new Event\OnClearEventArgs($this->em)); $this->evm->dispatchEvent(Events::onClear, new Event\OnClearEventArgs($this->em));
}
} else {
$visited = array();
foreach ($this->identityMap as $className => $entities) {
if ($className === $entityName) {
foreach ($entities as $entity) {
$this->doDetach($entity, $visited);
}
}
}
} }
} }