Doctrine

Timestamp:

02/15/08 14:49:21 (17 months ago)

Author:

guilhermeblanco

Message:

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

Files:

• branches/0.10/lib/Doctrine/Query.php (modified) (2 diffs)
• branches/0.9/lib/Doctrine/Query.php (modified) (1 diff)
• trunk/lib/Doctrine/Query.php (modified) (2 diffs)

branches/0.10/lib/Doctrine/Query.php

@@ -1102 +1102 @@
             $this->_pendingAggregates = array();
             $this->_aggregateAliasMap = array();
+            $this->_enumParams = array();
         }
         $this->reset();
@@ -1114 +1115 @@
         }
         $this->_state = self::STATE_CLEAN;
-        
-        $params = $this->convertEnums($params);        
-
+
+        $params = $this->convertEnums($params);
 
         // Proceed with the generated SQL
-        
+
         if (empty($this->_sqlParts['from'])) {
             return false;

branches/0.9/lib/Doctrine/Query.php

@@ -1122 +1122 @@
             $this->pendingAggregates = array();
             $this->aggregateMap = array();
-        }
-        $this->reset();   
+            $this->_enumParams = array();
+        }
+        $this->reset();
 
         // parse the DQL parts

trunk/lib/Doctrine/Query.php

@@ -1063 +1063 @@
             $this->_pendingAggregates = array();
             $this->_aggregateAliasMap = array();
+            $this->_enumParams = array();
         }
         $this->reset();
@@ -1075 +1076 @@
         }
         $this->_state = self::STATE_CLEAN;
-        
-        $params = $this->convertEnums($params);        
-
+
+        $params = $this->convertEnums($params);
 
         // Proceed with the generated SQL
-        
+
         if (empty($this->_sqlParts['from'])) {
             return false;