Merge pull request #190 from FabioBatSilva/DDC-1978

Fix DDC-1978
doctrine · Aug 29, 2012 · 24ec194 · 24ec194
2 parents 3965d4f + 331582c
commit 24ec194
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 47 deletions.
diff --git a/lib/Doctrine/DBAL/SQLParserUtils.php b/lib/Doctrine/DBAL/SQLParserUtils.php
@@ -79,43 +79,50 @@ static public function getPlaceholderPositions($statement, $isPositional = true)
     /**
      * For a positional query this method can rewrite the sql statement with regard to array parameters.
      *
-     * @param string $query
-     * @param array $params
-     * @param array $types
+     * @param string    $query  The SQL query to execute.
+     * @param array     $params The parameters to bind to the query.
+     * @param array     $types  The types the previous parameters are in.
+     * 
      * @return array
      */
     static public function expandListParameters($query, $params, $types)
     {
-        $isPositional = is_int(key($params));
+        $isPositional   = is_int(key($params));
         $arrayPositions = array();
-        $bindIndex = -1;
+        $bindIndex      = -1;
+
         foreach ($types as $name => $type) {
             ++$bindIndex;
-            if ($type === Connection::PARAM_INT_ARRAY || $type === Connection::PARAM_STR_ARRAY) {
-                if ($isPositional) {
-                    $name = $bindIndex;
-                }
 
-                $arrayPositions[$name] = false;
+            if ($type !== Connection::PARAM_INT_ARRAY && $type !== Connection::PARAM_STR_ARRAY) {
+                continue;
+            }
+
+            if ($isPositional) {
+                $name = $bindIndex;
             }
+
+            $arrayPositions[$name] = false;
         }
 
-        if ((!$arrayPositions && $isPositional) || (count($params) != count($types))) {
+        if (( ! $arrayPositions && $isPositional) || (count($params) != count($types))) {
             return array($query, $params, $types);
         }
 
         $paramPos = self::getPlaceholderPositions($query, $isPositional);
+
         if ($isPositional) {
             $paramOffset = 0;
             $queryOffset = 0;
+
             foreach ($paramPos as $needle => $needlePos) {
-                if (!isset($arrayPositions[$needle])) {
+                if ( ! isset($arrayPositions[$needle])) {
                     continue;
                 }
 
-                $needle += $paramOffset;
+                $needle    += $paramOffset;
                 $needlePos += $queryOffset;
-                $len = count($params[$needle]);
+                $count      = count($params[$needle]);
 
                 $params = array_merge(
                     array_slice($params, 0, $needle),
@@ -125,50 +132,52 @@ static public function expandListParameters($query, $params, $types)
 
                 $types = array_merge(
                     array_slice($types, 0, $needle),
-                    array_fill(0, $len, $types[$needle] - Connection::ARRAY_PARAM_OFFSET), // array needles are at PDO::PARAM_* + 100
+                    array_fill(0, $count, $types[$needle] - Connection::ARRAY_PARAM_OFFSET), // array needles are at PDO::PARAM_* + 100
                     array_slice($types, $needle + 1)
                 );
 
-                $expandStr = implode(", ", array_fill(0, $len, "?"));
-                $query = substr($query, 0, $needlePos) . $expandStr . substr($query, $needlePos + 1);
+                $expandStr  = implode(", ", array_fill(0, $count, "?"));
+                $query      = substr($query, 0, $needlePos) . $expandStr . substr($query, $needlePos + 1);
 
-                $paramOffset += ($len - 1); // Grows larger by number of parameters minus the replaced needle.
+                $paramOffset += ($count - 1); // Grows larger by number of parameters minus the replaced needle.
                 $queryOffset += (strlen($expandStr) - 1);
             }
 
-        } else {
-            $queryOffset= 0;
-            $typesOrd   = array();
-            $paramsOrd  = array();
-            foreach ($paramPos as $pos => $paramName) {
-                $paramLen   = strlen($paramName) + 1;
-                $value      = $params[$paramName];
-
-                if (!isset($arrayPositions[$paramName])) {
-                    $pos         += $queryOffset;
-                    $queryOffset -= ($paramLen - 1);
-                    $paramsOrd[]  = $value;
-                    $typesOrd[]   = $types[$paramName];
-                    $query        = substr($query, 0, $pos) . '?' . substr($query, ($pos + $paramLen));
-                } else {
-                    $len = count($value);
-                    $expandStr = implode(", ", array_fill(0, $len, "?"));
+            return array($query, $params, $types);
+        }
 
-                    foreach ($value as $val) {
-                        $paramsOrd[] = $val;
-                        $typesOrd[]  = $types[$paramName] - Connection::ARRAY_PARAM_OFFSET;
-                    }
 
-                    $pos         += $queryOffset;
-                    $queryOffset += (strlen($expandStr) - $paramLen);
-                    $query        = substr($query, 0, $pos) . $expandStr . substr($query, ($pos + $paramLen));
-                }
+        $queryOffset = 0;
+        $typesOrd    = array();
+        $paramsOrd   = array();
+
+        foreach ($paramPos as $pos => $paramName) {
+            $paramLen   = strlen($paramName) + 1;
+            $value      = $params[$paramName];
+
+            if ( ! isset($arrayPositions[$paramName])) {
+                $pos         += $queryOffset;
+                $queryOffset -= ($paramLen - 1);
+                $paramsOrd[]  = $value;
+                $typesOrd[]   = $types[$paramName];
+                $query        = substr($query, 0, $pos) . '?' . substr($query, ($pos + $paramLen));
+
+                continue;
+            }
+
+            $count      = count($value);
+            $expandStr  = $count > 0 ? implode(', ', array_fill(0, $count, '?')) : '?';
+
+            foreach ($value as $val) {
+                $paramsOrd[] = $val;
+                $typesOrd[]  = $types[$paramName] - Connection::ARRAY_PARAM_OFFSET;
             }
 
-            $types  = $typesOrd;
-            $params = $paramsOrd;
+            $pos         += $queryOffset;
+            $queryOffset += (strlen($expandStr) - $paramLen);
+            $query        = substr($query, 0, $pos) . $expandStr . substr($query, ($pos + $paramLen));
         }
 
-        return array($query, $params, $types);
+        return array($query, $paramsOrd, $typesOrd);
     }
-}
+}
diff --git a/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php b/tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php
@@ -98,6 +98,24 @@ static public function dataExpandListParameters()
                 array(1, 2, 3, 4, 5),
                 array(\PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT)
             ),
+            //  Positional : Empty "integer" array DDC-1978
+            array(
+                "SELECT * FROM Foo WHERE foo IN (?)",
+                array('foo'=>array()),
+                array('foo'=>Connection::PARAM_INT_ARRAY),
+                'SELECT * FROM Foo WHERE foo IN (?)',
+                array(),
+                array()
+            ),
+            //  Positional : Empty "str" array DDC-1978
+            array(
+                "SELECT * FROM Foo WHERE foo IN (?)",
+                array('foo'=>array()),
+                array('foo'=>Connection::PARAM_STR_ARRAY),
+                'SELECT * FROM Foo WHERE foo IN (?)',
+                array(),
+                array()
+            ),
             //  Named parameters : Very simple with param int
             array(
                 "SELECT * FROM Foo WHERE foo = :foo",
@@ -191,6 +209,24 @@ static public function dataExpandListParameters()
                 array(2, 3, 2),
                 array(\PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_INT)
             ),
+             //  Named parameters : Empty "integer" array DDC-1978
+            array(
+                "SELECT * FROM Foo WHERE foo IN (:foo)",
+                array('foo'=>array()),
+                array('foo'=>Connection::PARAM_INT_ARRAY),
+                'SELECT * FROM Foo WHERE foo IN (?)',
+                array(),
+                array()
+            ),
+             //  Named parameters : Two empty "str" array DDC-1978
+            array(
+                "SELECT * FROM Foo WHERE foo IN (:foo) OR bar IN (:bar)",
+                array('foo'=>array(), 'bar'=>array()),
+                array('foo'=>Connection::PARAM_STR_ARRAY, 'bar'=>Connection::PARAM_STR_ARRAY),
+                'SELECT * FROM Foo WHERE foo IN (?) OR bar IN (?)',
+                array(),
+                array()
+            ),
         );
     }