[DBAL-407] Introduce failing test for duplicate key exception code

.gitignore

@@ -5,3 +5,4 @@ dist/
 download/
 lib/Doctrine/Common/
 vendor/
+*.phpunit.xml

lib/Doctrine/DBAL/Connection.php

@@ -645,7 +645,7 @@ class Connection implements DriverConnection
         try {
             $stmt = new Statement($statement, $this);
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $statement);
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $statement);
         }
 
         $stmt->setFetchMode($this->defaultFetchMode);
@@ -698,7 +698,7 @@ class Connection implements DriverConnection
                 $stmt = $this->_conn->query($query);
             }
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $query, $this->resolveParams($params, $types));
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $query, $this->resolveParams($params, $types));
         }
 
         $stmt->setFetchMode($this->defaultFetchMode);
@@ -807,7 +807,7 @@ class Connection implements DriverConnection
                     break;
             }
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $args[0]);
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $args[0]);
         }
 
         $statement->setFetchMode($this->defaultFetchMode);
@@ -860,7 +860,7 @@ class Connection implements DriverConnection
                 $result = $this->_conn->exec($query);
             }
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $query, $this->resolveParams($params, $types));
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $query, $this->resolveParams($params, $types));
         }
 
         if ($logger) {
@@ -891,7 +891,7 @@ class Connection implements DriverConnection
         try {
             $result = $this->_conn->exec($statement);
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $statement);
+            throw DBALException::driverExceptionDuringQuery($this->_driver, $ex, $statement);
         }
 
         if ($logger) {

lib/Doctrine/DBAL/DBALException.php

@@ -21,6 +21,8 @@ namespace Doctrine\DBAL;
 
 class DBALException extends \Exception
 {
+    const ERROR_DUPLICATE_KEY = 1;
+
     /**
      * @param string $method
      *
@@ -74,13 +76,14 @@ class DBALException extends \Exception
     }
 
     /**
+     * @param \Doctrine\DBAL\Driver     $driver
      * @param \Exception $driverEx
      * @param string     $sql
      * @param array      $params
      *
      * @return \Doctrine\DBAL\DBALException
      */
-    public static function driverExceptionDuringQuery(\Exception $driverEx, $sql, array $params = array())
+    public static function driverExceptionDuringQuery(Driver $driver, \Exception $driverEx, $sql, array $params = array())
     {
         $msg = "An exception occurred while executing '".$sql."'";
         if ($params) {

lib/Doctrine/DBAL/Driver.php

@@ -72,4 +72,12 @@ interface Driver
      * @return string The name of the database.
      */
     public function getDatabase(Connection $conn);
+
+
+    /**
+     * @param \Exception $exception
+     *
+     * @return int
+     */
+    public function convertExceptionCode(\Exception $exception);
 }

lib/Doctrine/DBAL/Driver/DrizzlePDOMySql/Driver.php

@@ -99,4 +99,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/IBMDB2/DB2Driver.php

@@ -91,4 +91,12 @@ class DB2Driver implements Driver
 
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/Mysqli/Driver.php

@@ -67,4 +67,12 @@ class Driver implements DriverInterface
 
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/OCI8/Driver.php

@@ -113,4 +113,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return $params['user'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/PDOIbm/Driver.php

@@ -105,4 +105,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php

@@ -108,4 +108,12 @@ class Driver implements \Doctrine\DBAL\Driver
         }
         return $conn->query('SELECT DATABASE()')->fetchColumn();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/PDOOracle/Driver.php

@@ -113,4 +113,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return $params['user'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/PDOPgSql/Driver.php

@@ -99,5 +99,13 @@ class Driver implements \Doctrine\DBAL\Driver
             ? $params['dbname']
             : $conn->query('SELECT CURRENT_DATABASE()')->fetchColumn();
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }
 

lib/Doctrine/DBAL/Driver/PDOSqlite/Driver.php

@@ -112,4 +112,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return isset($params['path']) ? $params['path'] : null;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/PDOSqlsrv/Driver.php

@@ -102,4 +102,12 @@ class Driver implements \Doctrine\DBAL\Driver
 
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Driver/SQLSrv/Driver.php

@@ -83,4 +83,12 @@ class Driver implements \Doctrine\DBAL\Driver
         $params = $conn->getParams();
         return $params['dbname'];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function convertExceptionCode(\Exception $exception)
+    {
+        return 0;
+    }
 }

lib/Doctrine/DBAL/Statement.php

@@ -164,7 +164,12 @@ class Statement implements \IteratorAggregate, DriverStatement
         try {
             $stmt = $this->stmt->execute($params);
         } catch (\Exception $ex) {
-            throw DBALException::driverExceptionDuringQuery($ex, $this->sql, $this->conn->resolveParams($this->params, $this->types));
+            throw DBALException::driverExceptionDuringQuery(
+                $this->conn->getDriver(),
+                $ex,
+                $this->sql,
+                $this->conn->resolveParams($this->params, $this->types)
+            );
         }
 
         if ($logger) {

tests/Doctrine/Tests/DBAL/DBALExceptionTest.php

@@ -8,7 +8,8 @@ class DBALExceptionTest extends \Doctrine\Tests\DbalTestCase
 {
     public function testDriverExceptionDuringQueryAcceptsBinaryData()
     {
-        $e = DBALException::driverExceptionDuringQuery(new \Exception, '', array('ABC', chr(128)));
+        $driver = $this->getMock('\Doctrine\DBAL\Driver');
+        $e = DBALException::driverExceptionDuringQuery($driver, new \Exception, '', array('ABC', chr(128)));
         $this->assertContains('with params ["ABC", "\x80"]', $e->getMessage());
     }
 }

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

+<?php
+namespace Doctrine\Tests\DBAL\Functional;
+
+use Doctrine\DBAL\DBALException;
+
+require_once __DIR__ . '/../../TestInit.php';
+
+class ExceptionTest extends \Doctrine\Tests\DbalFunctionalTestCase
+{
+    public function testDuplicateKeyException()
+    {
+        /* @var $sm \Doctrine\DBAL\Schema\AbstractSchemaManager */
+        $table = new \Doctrine\DBAL\Schema\Table("duplicatekey_table");
+        $table->addColumn('id', 'integer', array());
+        $table->setPrimaryKey(array('id'));
+
+        foreach ($this->_conn->getDatabasePlatform()->getCreateTableSQL($table) AS $sql) {
+            $this->_conn->executeQuery($sql);
+        }
+
+        $this->_conn->insert("duplicatekey_table", array('id' => 1));
+
+        $this->setExpectedException('\Doctrine\DBAL\DBALException', null, DBALException::ERROR_DUPLICATE_KEY);
+        $this->_conn->insert("duplicatekey_table", array('id' => 1));
+    }
+}
+ 
\ No newline at end of file