[DBAL-138] Connection::quote now supports both DBAL and PDO types

lib/Doctrine/DBAL/Connection.php

@@ -556,7 +556,8 @@ class Connection implements DriverConnection
     {
         $this->connect();
 
-        return $this->_conn->quote($input, $type);
+        list($value, $bindingType) = $this->getBindingInfo($input, $type);
+        return $this->_conn->quote($input, $bindingType);
     }
 
     /**
@@ -1069,15 +1070,7 @@ class Connection implements DriverConnection
                 $typeIndex = $bindIndex + $typeOffset;
                 if (isset($types[$typeIndex])) {
                     $type = $types[$typeIndex];
-                    if (is_string($type)) {
-                        $type = Type::getType($type);
-                    }
-                    if ($type instanceof Type) {
-                        $value = $type->convertToDatabaseValue($value, $this->_platform);
-                        $bindingType = $type->getBindingType();
-                    } else {
-                        $bindingType = $type; // PDO::PARAM_* constants
-                    }
+                    list($value, $bindingType) = $this->getBindingInfo($value, $type);
                     $stmt->bindValue($bindIndex, $value, $bindingType);
                 } else {
                     $stmt->bindValue($bindIndex, $value);
@@ -1089,6 +1082,24 @@ class Connection implements DriverConnection
             foreach ($params as $name => $value) {
                 if (isset($types[$name])) {
                     $type = $types[$name];
+                    list($value, $bindingType) = $this->getBindingInfo($value, $type);
+                    $stmt->bindValue($name, $value, $bindingType);
+                } else {
+                    $stmt->bindValue($name, $value);
+                }
+            }
+        }
+    }
+
+    /**
+     * Gets the binding type of a given type. The given type can be a PDO or DBAL mapping type.
+     *
+     * @param mixed $value The value to bind
+     * @param mixed $type The type to bind (PDO or DBAL)
+     * @return array [0] => the (escaped) value, [1] => the binding type
+     */
+    private function getBindingInfo($value, $type)
+    {
         if (is_string($type)) {
             $type = Type::getType($type);
         }
@@ -1098,12 +1109,7 @@ class Connection implements DriverConnection
         } else {
             $bindingType = $type; // PDO::PARAM_* constants
         }
-                    $stmt->bindValue($name, $value, $bindingType);
-                } else {
-                    $stmt->bindValue($name, $value);
-                }
-            }
-        }
+        return array($value, $bindingType);
     }
 
     /**

tests/Doctrine/Tests/DBAL/Functional/ConnectionTest.php

@@ -3,6 +3,7 @@
 namespace Doctrine\Tests\DBAL\Functional;
 
 use Doctrine\DBAL\ConnectionException;
+use Doctrine\DBAL\Types\Type;
 
 require_once __DIR__ . '/../../TestInit.php';
 
@@ -207,4 +208,12 @@ class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
             $conn->executeQuery($conn->getDatabasePlatform()->getDummySelectSQL());
         });
     }
+
+    /**
+     * Tests that the quote function accepts DBAL and PDO types.
+     */
+    public function testQuote()
+    {
+        $this->assertEquals($this->_conn->quote("foo", Type::STRING), $this->_conn->quote("foo", \PDO::PARAM_STR));
+    }
 }