Merge pull request #771 from rbayliss/master

Fix unique index exception handling for an index on multiple columns in PHP 5.4

lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php

@@ -42,6 +42,7 @@ abstract class AbstractSQLiteDriver implements Driver, ExceptionConverterDriver
     {
         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);

tests/Doctrine/Tests/DBAL/Driver/AbstractSQLiteDriverTest.php

@@ -71,6 +71,7 @@ class AbstractSQLiteDriverTest extends AbstractDriverTest
             self::EXCEPTION_UNIQUE_CONSTRAINT_VIOLATION => array(
                 array(null, null, 'must be unique'),
                 array(null, null, 'is not unique'),
+                array(null, null, 'are not unique'),
             ),
         );
     }