Commit a3348dda authored by guilhermeblanco's avatar guilhermeblanco

Applied patch provided by ticket #788 in 0.9, 0.10 and trunk

parent f5b0b6bf
...@@ -1062,6 +1062,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria ...@@ -1062,6 +1062,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$this->_queryComponents = array(); $this->_queryComponents = array();
$this->_pendingAggregates = array(); $this->_pendingAggregates = array();
$this->_aggregateAliasMap = array(); $this->_aggregateAliasMap = array();
$this->_enumParams = array();
} }
$this->reset(); $this->reset();
...@@ -1074,12 +1075,11 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria ...@@ -1074,12 +1075,11 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable, Seria
$this->_processDqlQueryPart($queryPartName, $queryParts); $this->_processDqlQueryPart($queryPartName, $queryParts);
} }
$this->_state = self::STATE_CLEAN; $this->_state = self::STATE_CLEAN;
$params = $this->convertEnums($params);
$params = $this->convertEnums($params);
// Proceed with the generated SQL // Proceed with the generated SQL
if (empty($this->_sqlParts['from'])) { if (empty($this->_sqlParts['from'])) {
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment