Merge remote branch 'juokaz/sqlsrv-driver' into sqlsrv

doctrine · Nov 18, 2010 · 2bfbde3 · 2bfbde3
2 parents 454d1e0 + 43048d5
commit 2bfbde3
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 163 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php b/lib/Doctrine/DBAL/Driver/PDOMsSql/Driver.php
diff --git a/...trine/DBAL/Driver/PDOMsSql/Connection.php → ...rine/DBAL/Driver/PDOSqlsrv/Connection.php b/...trine/DBAL/Driver/PDOMsSql/Connection.php → ...rine/DBAL/Driver/PDOSqlsrv/Connection.php
@@ -19,42 +19,27 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\DBAL\Driver\PDOMsSql;
+namespace Doctrine\DBAL\Driver\PDOSqlsrv;
 
 /**
- * MsSql Connection implementation.
+ * Sqlsrv Connection implementation.
  *
  * @since 2.0
  */
-class Connection extends \PDO implements \Doctrine\DBAL\Driver\Connection
+class Connection extends \Doctrine\DBAL\Driver\PDOConnection implements \Doctrine\DBAL\Driver\Connection
 {
     /**
-     * Performs the rollback.
-     * 
      * @override
      */
-    public function rollback()
+    public function quote($value, $type=\PDO::PARAM_STR)
     {
-        $this->exec('ROLLBACK TRANSACTION');
-    }
-
-    /**
-     * Performs the commit.
-     * 
-     * @override
-     */
-    public function commit()
-    {
-        $this->exec('COMMIT TRANSACTION');
-    }
-
-    /**
-     * Begins a database transaction.
-     * 
-     * @override
-     */
-    public function beginTransaction()
-    {
-        $this->exec('BEGIN TRANSACTION');
+        $val = parent::quote($value, $type);
+
+		// Fix for a driver version terminating all values with null byte
+		if (strpos($val, "\0") !== false) {
+			$val = substr($val, 0, -1);
+		}
+
+		return $val;
     }
 }
diff --git a/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php b/lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php
@@ -30,7 +30,7 @@ class Driver implements \Doctrine\DBAL\Driver
 {
     public function connect(array $params, $username = null, $password = null, array $driverOptions = array())
     {        
-        return new \Doctrine\DBAL\Driver\PDOConnection(
+        return new Connection(
             $this->_constructPdoDsn($params),
             $username,
             $password,

diff --git a/lib/Doctrine/DBAL/DriverManager.php b/lib/Doctrine/DBAL/DriverManager.php
@@ -40,7 +40,6 @@ final class DriverManager
             'pdo_sqlite' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver',
             'pdo_pgsql'  => 'Doctrine\DBAL\Driver\PDOPgSql\Driver',
             'pdo_oci' => 'Doctrine\DBAL\Driver\PDOOracle\Driver',
-            'pdo_mssql'  => 'Doctrine\DBAL\Driver\PDOMsSql\Driver',
             'oci8' => 'Doctrine\DBAL\Driver\OCI8\Driver',
             'ibm_db2' => 'Doctrine\DBAL\Driver\IBMDB2\DB2Driver',
             'pdo_ibm' => 'Doctrine\DBAL\Driver\PDOIbm\Driver',
@@ -62,7 +61,7 @@ private function __construct() { }
      *     pdo_sqlite
      *     pdo_pgsql
      *     pdo_oracle
-     *     pdo_mssql
+     *     pdo_sqlsrv
      * 
      * OR 'driverClass' that contains the full class name (with namespace) of the
      * driver class to instantiate.