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-720 - Correct mentioned issues by @asm89

Browse source
This commit is contained in:
Benjamin Eberlei 2011-10-23 10:05:46 +02:00
parent b910a487c5
commit 5d3298e706
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -325,6 +325,10 @@ class EntityManager implements ObjectManager
* This effectively synchronizes the in-memory state of managed objects with the * This effectively synchronizes the in-memory state of managed objects with the
* database. * database.
* *
* If an entity is explicitly passed to this method only this entity and
* the cascade-persist semantics + scheduled inserts/removals are synchronized.
*
* @param object $entity
* @throws Doctrine\ORM\OptimisticLockException If a version check on an entity that * @throws Doctrine\ORM\OptimisticLockException If a version check on an entity that
* makes use of optimistic locking fails. * makes use of optimistic locking fails.
*/ */

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

@ -253,7 +253,9 @@ class UnitOfWork implements PropertyChangedListener
* 3) All collection deletions * 3) All collection deletions
* 4) All collection updates * 4) All collection updates
* 5) All entity deletions * 5) All entity deletions
* *
* @param object $entity
* @return void
*/ */
public function commit($entity = null) public function commit($entity = null)
{ {
@ -352,15 +354,28 @@ class UnitOfWork implements PropertyChangedListener
} }
/** /**
* Only flush the given entity according to a rulset that keeps the UoW consistent. * Compute the changesets of all entities scheduled for insertion
*
* @return void
*/
private function computeScheduleInsertsChangeSets()
{
foreach ($this->entityInsertions as $entity) {
$class = $this->em->getClassMetadata(get_class($entity));
$this->computeChangeSet($class, $entity);
}
}
/**
* Only flush the given entity according to a ruleset that keeps the UoW consistent.
* *
* 1. All entities scheduled for insertion, (orphan) removals and changes in collections are processed as well! * 1. All entities scheduled for insertion, (orphan) removals and changes in collections are processed as well!
* 2. Read Only entities are skipped. * 2. Read Only entities are skipped.
* 3. Proxies are skipped. * 3. Proxies are skipped.
* 4. Only if entity is properly managed. * 4. Only if entity is properly managed.
* *
* @param Proxy $entity * @param object $entity
* @return type * @return void
*/ */
private function computeSingleEntityChangeSet($entity) private function computeSingleEntityChangeSet($entity)
{ {
@ -375,10 +390,7 @@ class UnitOfWork implements PropertyChangedListener
} }
// Compute changes for INSERTed entities first. This must always happen even in this case. // Compute changes for INSERTed entities first. This must always happen even in this case.
foreach ($this->entityInsertions as $entity) { $this->computeScheduleInsertsChangeSets();
$class = $this->em->getClassMetadata(get_class($entity));
$this->computeChangeSet($class, $entity);
}
if ( $class->isReadOnly ) { if ( $class->isReadOnly ) {
return; return;
@ -575,10 +587,7 @@ class UnitOfWork implements PropertyChangedListener
public function computeChangeSets() public function computeChangeSets()
{ {
// Compute changes for INSERTed entities first. This must always happen. // Compute changes for INSERTed entities first. This must always happen.
foreach ($this->entityInsertions as $entity) { $this->computeScheduleInsertsChangeSets();
$class = $this->em->getClassMetadata(get_class($entity));
$this->computeChangeSet($class, $entity);
}
// Compute changes for other MANAGED entities. Change tracking policies take effect here. // Compute changes for other MANAGED entities. Change tracking policies take effect here.
foreach ($this->identityMap as $className => $entities) { foreach ($this->identityMap as $className => $entities) {