Merge branch 'DBAL-522' into 2.3

lib/Doctrine/DBAL/SQLParserUtils.php

@@ -212,12 +212,12 @@ class SQLParserUtils
      */
     static private function extractParam($paramName, $paramsOrTypes, $isParam, $defaultValue = null)
     {
-        if (isset($paramsOrTypes[$paramName])) {
+        if (array_key_exists($paramName, $paramsOrTypes)) {
             return $paramsOrTypes[$paramName];
         }
 
         // Hash keys can be prefixed with a colon for compatibility
-        if (isset($paramsOrTypes[':' . $paramName])) {
+        if (array_key_exists(':' . $paramName, $paramsOrTypes)) {
             return $paramsOrTypes[':' . $paramName];
         }
 

tests/Doctrine/Tests/DBAL/SQLParserUtilsTest.php

@@ -287,6 +287,23 @@ SQLDATA
                 array(1, 2, 'bar'),
                 array(\PDO::PARAM_INT, \PDO::PARAM_INT, \PDO::PARAM_STR)
             ),
+            // DBAL-522 - null valued parameters are not considered
+            array(
+                'INSERT INTO Foo (foo, bar) values (:foo, :bar)',
+                array('foo' => 1, 'bar' => null),
+                array(':foo' => \PDO::PARAM_INT, ':bar' => \PDO::PARAM_NULL),
+                'INSERT INTO Foo (foo, bar) values (?, ?)',
+                array(1, null),
+                array(\PDO::PARAM_INT, \PDO::PARAM_NULL)
+            ),
+            array(
+                'INSERT INTO Foo (foo, bar) values (?, ?)',
+                array(1, null),
+                array(\PDO::PARAM_INT, \PDO::PARAM_NULL),
+                'INSERT INTO Foo (foo, bar) values (?, ?)',
+                array(1, null),
+                array(\PDO::PARAM_INT, \PDO::PARAM_NULL)
+            ),
         );
     }