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

[2.0] Fixed commit order calculation.

Browse Source
This commit is contained in:
romanb 2009-10-28 11:00:17 +00:00
parent 4fc1781d78
commit ce6905cc5d
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -806,10 +806,8 @@ class UnitOfWork implements PropertyChangedListener
// See if there are any new classes in the changeset, that are not in the // See if there are any new classes in the changeset, that are not in the
// commit order graph yet (dont have a node). // commit order graph yet (dont have a node).
$newNodes = array(); $newNodes = array();
$classesInChangeSet = array();
foreach ($entityChangeSet as $oid => $entity) { foreach ($entityChangeSet as $oid => $entity) {
$className = get_class($entity); $className = get_class($entity);
$classesInChangeSet[$className] = true;
if ( ! $this->_commitOrderCalculator->hasClass($className)) { if ( ! $this->_commitOrderCalculator->hasClass($className)) {
$class = $this->_em->getClassMetadata($className); $class = $this->_em->getClassMetadata($className);
$this->_commitOrderCalculator->addClass($class); $this->_commitOrderCalculator->addClass($class);
@ -820,7 +818,7 @@ class UnitOfWork implements PropertyChangedListener
// Calculate dependencies for new nodes // Calculate dependencies for new nodes
foreach ($newNodes as $class) { foreach ($newNodes as $class) {
foreach ($class->associationMappings as $assoc) { foreach ($class->associationMappings as $assoc) {
if ($assoc->isOwningSide && $assoc->isOneToOne() && isset($classesInChangeSet[$assoc->targetEntityName])) { if ($assoc->isOwningSide && $assoc->isOneToOne()) {
$targetClass = $this->_em->getClassMetadata($assoc->targetEntityName); $targetClass = $this->_em->getClassMetadata($assoc->targetEntityName);
if ( ! $this->_commitOrderCalculator->hasClass($targetClass->name)) { if ( ! $this->_commitOrderCalculator->hasClass($targetClass->name)) {
$this->_commitOrderCalculator->addClass($targetClass); $this->_commitOrderCalculator->addClass($targetClass);