RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-03 05:49:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1552 from guiwoda/l2-invalid-collection-cache-key

Browse Source 
Collection cache key is built differently on read than on write
This commit is contained in:
Guilherme Blanco 2015-11-11 10:22:46 -05:00
commit 089a0ac60b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php
View File

@ -553,7 +553,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
if ($hasCache) { if ($hasCache) {
$ownerId = $this->uow->getEntityIdentifier($coll->getOwner()); $ownerId = $this->uow->getEntityIdentifier($coll->getOwner());
$key = new CollectionCacheKey($assoc['sourceEntity'], $assoc['fieldName'], $ownerId); $key = $this->buildCollectionCacheKey($assoc, $ownerId);
$list = $persister->loadCollectionCache($coll, $key); $list = $persister->loadCollectionCache($coll, $key);
if ($list !== null) { if ($list !== null) {
@ -588,7 +588,7 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
if ($hasCache) { if ($hasCache) {
$ownerId = $this->uow->getEntityIdentifier($coll->getOwner()); $ownerId = $this->uow->getEntityIdentifier($coll->getOwner());
$key = new CollectionCacheKey($assoc['sourceEntity'], $assoc['fieldName'], $ownerId); $key = $this->buildCollectionCacheKey($assoc, $ownerId);
$list = $persister->loadCollectionCache($coll, $key); $list = $persister->loadCollectionCache($coll, $key);
if ($list !== null) { if ($list !== null) {
@ -637,4 +637,17 @@ abstract class AbstractEntityPersister implements CachedEntityPersister
$this->persister->refresh($id, $entity, $lockMode); $this->persister->refresh($id, $entity, $lockMode);
} }
/**
* @param array $association
* @param array $ownerId
*
* @return CollectionCacheKey
*/
protected function buildCollectionCacheKey(array $association, $ownerId)
{
/** @var ClassMetadata $metadata */
$metadata = $this->metadataFactory->getMetadataFor($association['sourceEntity']);
return new CollectionCacheKey($metadata->rootEntityName, $association['fieldName'], $ownerId);
}
} }