RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 14:31:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch '2.2'

Browse Source
This commit is contained in:
Benjamin Eberlei 2012-01-09 08:26:33 +01:00
commit adec530c13
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/AbstractQuery.php
View File

@ -316,7 +316,7 @@ abstract class AbstractQuery
$this->_queryCacheProfile = $this->_queryCacheProfile
? $this->_queryCacheProfile->setLifetime($lifetime)
: new QueryCacheProfile($lifetime);
: new QueryCacheProfile($lifetime, null, $this->_em->getConfiguration()->getResultCacheImpl());
return $this;
}
@ -615,7 +615,7 @@ abstract class AbstractQuery
{
$this->_queryCacheProfile = $this->_queryCacheProfile
? $this->_queryCacheProfile->setCacheKey($id)
: new QueryCacheProfile(0, $id);
: new QueryCacheProfile(0, $id, $this->_em->getConfiguration()->getResultCacheImpl());
return $this;
}

13
tests/Doctrine/Tests/ORM/Query/QueryTest.php
View File

@ -2,7 +2,7 @@
namespace Doctrine\Tests\ORM\Query;
require_once __DIR__ . '/../../TestInit.php';
use Doctrine\Common\Cache\ArrayCache;
class QueryTest extends \Doctrine\Tests\OrmTestCase
{
@ -90,4 +90,15 @@ class QueryTest extends \Doctrine\Tests\OrmTestCase
$this->assertEquals('baz', $q->getHint('bar'));
$this->assertEquals(array('foo' => 'bar', 'bar' => 'baz'), $q->getHints());
}
/**
* @group DDC-1588
*/
public function testQueryDefaultResultCache()
{
$this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache());
$q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a");
$q->useResultCache(true);
$this->assertSame($this->_em->getConfiguration()->getResultCacheImpl(), $q->getQueryCacheProfile()->getResultCacheDriver());
}
}