RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-05 03:06:05 +03:00
Code Issues Projects Releases Wiki Activity

Query::_getQueryCacheId() directly accesses $this->_parsedTypes

Browse Source
This commit is contained in:
Benjamin Morel 2015-03-24 16:04:20 +01:00
parent 517cb7e2a2
commit 9eb458caa6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Doctrine/ORM/Query.php
View File

@ -265,7 +265,7 @@ final class Query extends AbstractQuery
return $this->_parserResult; return $this->_parserResult;
} }
$hash = $this->_getQueryCacheId($types); $hash = $this->_getQueryCacheId();
$cached = $this->_expireQueryCache ? false : $queryCache->fetch($hash); $cached = $this->_expireQueryCache ? false : $queryCache->fetch($hash);
if ($cached instanceof ParserResult) { if ($cached instanceof ParserResult) {
@ -693,11 +693,9 @@ final class Query extends AbstractQuery
/** /**
* Generate a cache id for the query cache - reusing the Result-Cache-Id generator. * Generate a cache id for the query cache - reusing the Result-Cache-Id generator.
* *
* @param array $types The parameter types, indexed by parameter key.
*
* @return string * @return string
*/ */
protected function _getQueryCacheId(array $types) protected function _getQueryCacheId()
{ {
ksort($this->_hints); ksort($this->_hints);
@ -711,7 +709,7 @@ final class Query extends AbstractQuery
'&platform=' . $platform . '&platform=' . $platform .
($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') .
'&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults .
'&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($types) . 'DOCTRINE_QUERY_CACHE_SALT' '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
); );
} }