Merge branch 'hotfix/#771-backport-php-5-4-unique-index-exception-err…

…or-handling' into 2.5
doctrine · Jan 11, 2015 · 2842400 · 2842400
2 parents 4067c72 + 8bfcf68
commit 2842400
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php b/lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php
@@ -42,6 +42,7 @@ public function convertException($message, DriverException $exception)
     {
         if (strpos($exception->getMessage(), 'must be unique') !== false ||
             strpos($exception->getMessage(), 'is not unique') !== false ||
+            strpos($exception->getMessage(), 'are not unique') !== false ||
             strpos($exception->getMessage(), 'UNIQUE constraint failed') !== false
         ) {
             return new Exception\UniqueConstraintViolationException($message, $exception);

diff --git a/tests/Doctrine/Tests/DBAL/Driver/AbstractSQLiteDriverTest.php b/tests/Doctrine/Tests/DBAL/Driver/AbstractSQLiteDriverTest.php
@@ -71,6 +71,7 @@ protected function getExceptionConversionData()
             self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => array(
                 array(null, null, 'must be unique'),
                 array(null, null, 'is not unique'),
+                array(null, null, 'are not unique'),
             ),
         );
     }