Merge pull request #594 from deeky666/fix-sqlite-driver-exception-conversion

Fix driver exception conversion for newer SQLite versions

lib/Doctrine/DBAL/Driver/AbstractSQLiteDriver.php

@@ -40,18 +40,19 @@ abstract class AbstractSQLiteDriver implements Driver, ExceptionConverterDriver
      */
     public function convertException($message, DriverException $exception)
     {
-        if (strpos($exception->getMessage(), 'must be unique') !== false) {
+        if (strpos($exception->getMessage(), 'must be unique') !== false ||
+            strpos($exception->getMessage(), 'is not unique') !== false ||
+            strpos($exception->getMessage(), 'UNIQUE constraint failed') !== false
+        ) {
             return new Exception\UniqueConstraintViolationException($message, $exception);
         }
 
-        if (strpos($exception->getMessage(), 'may not be NULL') !== false) {
+        if (strpos($exception->getMessage(), 'may not be NULL') !== false ||
+            strpos($exception->getMessage(), 'NOT NULL constraint failed') !== false
+        ) {
             return new Exception\NotNullConstraintViolationException($message, $exception);
         }
 
-        if (strpos($exception->getMessage(), 'is not unique') !== false) {
-            return new Exception\UniqueConstraintViolationException($message, $exception);
-        }
-
         if (strpos($exception->getMessage(), 'no such table:') !== false) {
             return new Exception\TableNotFoundException($message, $exception);
         }