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

Refactored IdentifierFlattener

Browse source
This commit is contained in:
Asmir Mustafic 2015-01-18 23:18:41 +01:00 • committed by Marco Pivetta
parent 081ad0efbe
commit 2eb7dedf4f
3 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,6 +49,7 @@ use Doctrine\ORM\Persisters\Entity\JoinedSubclassPersister;
use Doctrine\ORM\Persisters\Collection\OneToManyPersister; use Doctrine\ORM\Persisters\Collection\OneToManyPersister;
use Doctrine\ORM\Persisters\Collection\ManyToManyPersister; use Doctrine\ORM\Persisters\Collection\ManyToManyPersister;
use Doctrine\ORM\Utility\IdentifierFlattener; use Doctrine\ORM\Utility\IdentifierFlattener;
use Doctrine\ORM\Cache\AssociationCacheEntry;
/** /**
* The UnitOfWork is responsible for tracking changes to objects during an * The UnitOfWork is responsible for tracking changes to objects during an
@ -2490,22 +2491,7 @@ class UnitOfWork implements PropertyChangedListener
$class = $this->em->getClassMetadata($className); $class = $this->em->getClassMetadata($className);
//$isReadOnly = isset($hints[Query::HINT_READ_ONLY]); //$isReadOnly = isset($hints[Query::HINT_READ_ONLY]);
if ($class->isIdentifierComposite) { $id = $this->identifierFlattener->flattenIdentifier($class, $data);
$id = array();
foreach ($class->identifier as $fieldName) {
$id[$fieldName] = isset($class->associationMappings[$fieldName])
? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]
: $data[$fieldName];
}
} else {
$id = isset($class->associationMappings[$class->identifier[0]])
? $data[$class->associationMappings[$class->identifier[0]]['joinColumns'][0]['name']]
: $data[$class->identifier[0]];
$id = array($class->identifier[0] => $id);
}
$idHash = implode(' ', $id); $idHash = implode(' ', $id);
if (isset($this->identityMap[$class->rootEntityName][$idHash])) { if (isset($this->identityMap[$class->rootEntityName][$idHash])) {
@ -2639,10 +2625,18 @@ class UnitOfWork implements PropertyChangedListener
if ($joinColumnValue !== null) { if ($joinColumnValue !== null) {
if ($targetClass->containsForeignIdentifier) { if ($targetClass->containsForeignIdentifier) {
if ($joinColumnValue instanceof AssociationCacheEntry) {
$joinColumnValue = implode(' ', $joinColumnValue->identifier);
}
$associatedId[$targetClass->getFieldForColumn($targetColumn)] = $joinColumnValue; $associatedId[$targetClass->getFieldForColumn($targetColumn)] = $joinColumnValue;
} else { } else {
$associatedId[$targetClass->fieldNames[$targetColumn]] = $joinColumnValue; $associatedId[$targetClass->fieldNames[$targetColumn]] = $joinColumnValue;
} }
} elseif ($targetClass->containsForeignIdentifier && in_array($targetClass->getFieldForColumn($targetColumn), $targetClass->identifier, true)) {
// the missing key is part of target's entity primary key
$associatedId = array();
break;
} }
} }

24
lib/Doctrine/ORM/Utility/IdentifierFlattener.php
View file

@ -71,22 +71,24 @@ final class IdentifierFlattener
{ {
$flatId = array(); $flatId = array();
foreach ($id as $idField => $idValue) { foreach ($class->identifier as $field) {
if (isset($class->associationMappings[$idField]) && is_object($idValue)) { if (isset($class->associationMappings[$field]) && isset($id[$field]) && is_object($id[$field])) {
/* @var $targetClassMetadata ClassMetadata */
$targetClassMetadata = $this->metadataFactory->getMetadataFor( $targetClassMetadata = $this->metadataFactory->getMetadataFor(
$class->associationMappings[$idField]['targetEntity'] $class->associationMappings[$field]['targetEntity']
); );
$associatedId = $this->flattenIdentifier($targetClassMetadata, $this->unitOfWork->getEntityIdentifier($id[$field]));
$associatedId = $this->unitOfWork->isInIdentityMap($idValue) $flatId[$field] = implode(' ', $associatedId);
? $this->unitOfWork->getEntityIdentifier($idValue) } elseif (isset($class->associationMappings[$field])) {
: $targetClassMetadata->getIdentifierValues($idValue); $associatedId = array();
foreach ($class->associationMappings[$field]['joinColumns'] as $joinColumn) {
$flatId[$idField] = $associatedId[$targetClassMetadata->identifier[0]]; $associatedId[] = $id[$joinColumn['name']];
}
$flatId[$field] = implode(' ', $associatedId);
} else { } else {
$flatId[$idField] = $idValue; $flatId[$field] = $id[$field];
} }
} }
return $flatId; return $flatId;
} }

11
tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php
View file

@ -9,6 +9,7 @@ use Doctrine\Tests\Models\Cache\City;
use Doctrine\Tests\Models\Cache\Flight; use Doctrine\Tests\Models\Cache\Flight;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
use Doctrine\ORM\Utility\IdentifierFlattener; use Doctrine\ORM\Utility\IdentifierFlattener;
/** /**
* Test the IdentifierFlattener utility class * Test the IdentifierFlattener utility class
* *
@ -87,7 +88,7 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase
$this->assertArrayHasKey('secondEntity', $flatIds, 'It should be called secondEntity'); $this->assertArrayHasKey('secondEntity', $flatIds, 'It should be called secondEntity');
$this->assertSame($id['secondEntity']->id, $flatIds['secondEntity']); $this->assertEquals($id['secondEntity']->id, $flatIds['secondEntity']);
} }
/** /**
@ -115,8 +116,8 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase
$this->assertArrayHasKey('leavingFrom', $id); $this->assertArrayHasKey('leavingFrom', $id);
$this->assertArrayHasKey('goingTo', $id); $this->assertArrayHasKey('goingTo', $id);
$this->assertSame($leeds, $id['leavingFrom']); $this->assertEquals($leeds, $id['leavingFrom']);
$this->assertSame($london, $id['goingTo']); $this->assertEquals($london, $id['goingTo']);
$flatIds = $this->identifierFlattener->flattenIdentifier($class, $id); $flatIds = $this->identifierFlattener->flattenIdentifier($class, $id);
@ -125,7 +126,7 @@ class IdentifierFlattenerTest extends OrmFunctionalTestCase
$this->assertArrayHasKey('leavingFrom', $flatIds); $this->assertArrayHasKey('leavingFrom', $flatIds);
$this->assertArrayHasKey('goingTo', $flatIds); $this->assertArrayHasKey('goingTo', $flatIds);
$this->assertSame($id['leavingFrom']->getId(), $flatIds['leavingFrom']); $this->assertEquals($id['leavingFrom']->getId(), $flatIds['leavingFrom']);
$this->assertSame($id['goingTo']->getId(), $flatIds['goingTo']); $this->assertEquals($id['goingTo']->getId(), $flatIds['goingTo']);
} }
} }