This commit is contained in:
parent
4b7a4a0e97
commit
074a434ae2
1 changed files with 2 additions and 4 deletions
|
@ -249,7 +249,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
|
||||||
} else {
|
} else {
|
||||||
$this->_dqlParts[$queryPartName] = array($queryPart);
|
$this->_dqlParts[$queryPartName] = array($queryPart);
|
||||||
}
|
}
|
||||||
if ($this->_options['resultSetCache'] || $this->_options['parserCache']) {
|
if ( ! $this->_options['resultSetCache'] && ! $this->_options['parserCache']) {
|
||||||
$this->getParser($queryPartName)->parse($queryPart);
|
$this->getParser($queryPartName)->parse($queryPart);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -432,8 +432,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
|
||||||
|
|
||||||
$sql = $this->createSubquery()->parseQuery($dql, false)->getQuery();
|
$sql = $this->createSubquery()->parseQuery($dql, false)->getQuery();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
reset($this->_aliasMap);
|
reset($this->_aliasMap);
|
||||||
$componentAlias = key($this->_aliasMap);
|
$componentAlias = key($this->_aliasMap);
|
||||||
$tableAlias = $this->getTableAlias($componentAlias);
|
$tableAlias = $this->getTableAlias($componentAlias);
|
||||||
|
@ -687,7 +685,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
|
||||||
}
|
}
|
||||||
|
|
||||||
// append sql query into cache
|
// append sql query into cache
|
||||||
if ($this->_options['parserCache'] !== false) {
|
if ($this->_options['parserCache'] !== false) {
|
||||||
$this->_options['parserCache']->save($hash, $q);
|
$this->_options['parserCache']->save($hash, $q);
|
||||||
}
|
}
|
||||||
return $q;
|
return $q;
|
||||||
|
|
Loading…
Add table
Reference in a new issue