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

Merge pull request #971 from FabioBatSilva/slc-query-assoc-proxy

Browse Source 
[SLC] Fix query association proxy
This commit is contained in:
Fabio B. Silva 2014-03-06 15:43:58 -05:00
commit ecf242f6d4
2 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Doctrine/ORM/Cache/DefaultQueryCache.php
View File

@ -108,6 +108,7 @@ class DefaultQueryCache implements QueryCache
$entityName = reset($rsm->aliasMap);
$hasRelation = ( ! empty($rsm->relationMap));
$persister = $this->uow->getEntityPersister($entityName);
$metadata = ( ! $hasRelation) ? $persister->getClassMetadata() : null;
$region = $persister->getCacheRegion();
$regionName = $region->getName();
@ -126,15 +127,22 @@ class DefaultQueryCache implements QueryCache
if ($this->cacheLogger !== null) {
$this->cacheLogger->entityCacheHit($regionName, $entityKey);
}
$data = $entityEntry->data;
if ( ! $hasRelation) {
$result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->data, self::$hints);
foreach ($metadata->associationMappings as $name => $assoc) {
if ( ! ($assoc['type'] & ClassMetadata::TO_ONE) || ! isset($assoc['cache']) || ! isset($data[$name])) {
continue;
}
$data[$name] = $this->em->getReference($data[$name]->class, $data[$name]->identifier);
}
$result[$index] = $this->uow->createEntity($entityEntry->class, $data, self::$hints);
continue;
}
$data = $entityEntry->data;
foreach ($entry['associations'] as $name => $assoc) {
$assocPersister = $this->uow->getEntityPersister($assoc['targetEntity']);

48
tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheQueryCacheTest.php
View File

@ -827,6 +827,54 @@ class SecondLevelCacheQueryCacheTest extends SecondLevelCacheAbstractTest
$this->assertEquals(1, $this->secondLevelCacheLogger->getRegionMissCount('bar_region'));
}
public function testToOneAssociationShouldUseProxyForCacheableMetaResultColumn()
{
$this->evictRegions();
$this->loadFixturesCountries();
$this->loadFixturesStates();
$this->_em->clear();
$stateId = $this->states[0]->getId();
$countryName = $this->states[0]->getCountry()->getName();
$dql = 'SELECT s FROM Doctrine\Tests\Models\Cache\State s WHERE s.id = :id';
$query = $this->_em->createQuery($dql);
$queryCount = $this->getCurrentQueryCount();
$query1 = clone $query;
$state1 = $query1
->setParameter('id', $stateId)
->setCacheable(true)
->setMaxResults(1)
->getSingleResult();
$this->assertNotNull($state1);
$this->assertNotNull($state1->getCountry());
$this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
$this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state1);
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state1->getCountry());
$this->assertEquals($countryName, $state1->getCountry()->getName());
$this->assertEquals($stateId, $state1->getId());
$this->_em->clear();
$queryCount = $this->getCurrentQueryCount();
$query2 = clone $query;
$state2 = $query2
->setParameter('id', $stateId)
->setCacheable(true)
->setMaxResults(1)
->getSingleResult();
$this->assertNotNull($state2);
$this->assertNotNull($state2->getCountry());
$this->assertEquals($queryCount, $this->getCurrentQueryCount());
$this->assertInstanceOf('Doctrine\Tests\Models\Cache\State', $state2);
$this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $state2->getCountry());
$this->assertEquals($countryName, $state2->getCountry()->getName());
$this->assertEquals($stateId, $state2->getId());
}
public function testHintClearEntityRegionUpdateStatement()
{
$this->evictRegions();