Doctrine

Timestamp:

12/18/08 00:15:10 (7 months ago)

Author:

jwage

Message:

[1.0, 1.1] Fixes issue with identifier quoting and limit subquery (closes #1762)

Location:

branches

Files:

• 1.0/lib/Doctrine/Query.php (modified) (1 diff)
• 1.0/lib/Doctrine/Query/Abstract.php (modified) (1 diff)
• 1.0/tests/Ticket/1762TestCase.php (added)
• 1.1/lib/Doctrine/Query.php (modified) (1 diff)
• 1.1/lib/Doctrine/Query/Abstract.php (modified) (2 diffs)
• 1.1/tests/Ticket/1762TestCase.php (added)

branches/1.0/lib/Doctrine/Query.php

@@ -1226 +1226 @@
         if ($driverName == 'pgsql' || $driverName == 'oracle' || $driverName == 'oci') {
             foreach ($this->_sqlParts['orderby'] as $part) {
-                $part = trim($part);
+                // Remove identifier quoting if it exists
+                $callback = create_function('$e', 'return trim($e, \'[]`"\');');
+                $part = trim(implode('.', array_map($callback, explode('.', $part))));
                 $e = $this->_tokenizer->bracketExplode($part, ' ');
                 $part = trim($e[0]);

branches/1.0/lib/Doctrine/Query/Abstract.php

@@ -539 +539 @@
     public function getParams($params = array())
     {
-        return array_merge($params, $this->_params['join'], $this->_params['set'], $this->_params['where'], $this->_params['having']);
+        return array_merge((array) $params, $this->_params['join'], $this->_params['set'], $this->_params['where'], $this->_params['having']);
     }
 

branches/1.1/lib/Doctrine/Query.php

@@ -1307 +1307 @@
         if ($driverName == 'pgsql' || $driverName == 'oracle' || $driverName == 'oci') {
             foreach ($this->_sqlParts['orderby'] as $part) {
-                $part = trim($part);
+                // Remove identifier quoting if it exists
+                $callback = create_function('$e', 'return trim($e, \'[]`"\');');
+                $part = trim(implode('.', array_map($callback, explode('.', $part))));
                 $e = $this->_tokenizer->bracketExplode($part, ' ');
                 $part = trim($e[0]);

branches/1.1/lib/Doctrine/Query/Abstract.php

@@ -558 +558 @@
     {
         return array_merge(
-            $params, $this->_params['exec'], 
+            (array) $params, (array) $this->_params['exec'], 
             $this->_params['join'], $this->_params['set'],
             $this->_params['where'], $this->_params['having']
@@ -1065 +1065 @@
         if ($this->isLimitSubqueryUsed() &&
                 $this->_conn->getAttribute(Doctrine::ATTR_DRIVER_NAME) !== 'mysql') {
-            $params = array_merge($params, $params);
+            $params = array_merge((array) $params, (array) $params);
         }