RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 12:26:11 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Fix and test for result cache.

Browse source
This commit is contained in:
romanb 2009-07-21 10:48:19 +00:00
parent 49434b0322
commit be0088f00c
3 changed files with 67 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/AbstractQuery.php
View file

@ -443,7 +443,12 @@ abstract class AbstractQuery
if ($cached === false) {
// Cache miss.
$result = $this->_doExecute($params);
$stmt = $this->_doExecute($params);
$result = $this->_em->getHydrator($this->_hydrationMode)->hydrateAll(
$stmt, $this->_resultSetMapping, $this->_hints
);
$cacheDriver->save($hash, serialize($result), $this->_resultCacheTTL);
return $result;
@ -467,7 +472,7 @@ abstract class AbstractQuery
/**
* Prepares the given parameters for execution in an SQL statement.
*
* Note to inheritors: This method must return a numerically, continously indexed array,
* Note to inheritors: This method must return a numerically, continuously indexed array,
* starting with index 0 where the values (the parameter values) are in the order
* in which the parameters appear in the SQL query.
*

1
tests/Doctrine/Tests/ORM/Functional/AllTests.php
View file

@ -25,6 +25,7 @@ class AllTests
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClassTableInheritanceTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\DetachedEntityTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryCacheTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\ResultCacheTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneUnidirectionalAssociationTest');
$suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneBidirectionalAssociationTest');

59
tests/Doctrine/Tests/ORM/Functional/ResultCacheTest.php Normal file
View file

@ -0,0 +1,59 @@
<?php
namespace Doctrine\Tests\ORM\Functional;
use Doctrine\Tests\Models\CMS\CmsUser;
use Doctrine\Common\Cache\ArrayCache;
require_once __DIR__ . '/../../TestInit.php';
/**
* ResultCacheTest
*
* @author robo
*/
class ResultCacheTest extends \Doctrine\Tests\OrmFunctionalTestCase
{
protected function setUp() {
$this->useModelSet('cms');
parent::setUp();
}
public function testQueryCache()
{
$user = new CmsUser;
$user->name = 'Roman';
$user->username = 'romanb';
$user->status = 'dev';
$this->_em->persist($user);
$this->_em->flush();
$query = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
$cache = new ArrayCache;
$query->setResultCache($cache);
$this->assertEquals(0, $cache->count());
$initialQueryCount = $this->_em->getConnection()->getQueryCount();
$users = $query->getResultList();
$this->assertEquals($initialQueryCount + 1, $this->_em->getConnection()->getQueryCount());
$this->assertEquals(1, $cache->count());
$this->assertEquals(1, count($users));
$this->assertEquals('Roman', $users[0]->name);
$this->_em->clear();
$query2 = $this->_em->createQuery('select ux from Doctrine\Tests\Models\CMS\CmsUser ux');
$query2->setResultCache($cache);
$users = $query2->getResultList();
$this->assertEquals($initialQueryCount + 1, $this->_em->getConnection()->getQueryCount());
$this->assertEquals(1, $cache->count());
$this->assertEquals(1, count($users));
$this->assertEquals('Roman', $users[0]->name);
}
}