[SQL-CVS] r4703 - in SQLObject/branches/1.5: docs sqlobject/sqlite

[<sub...@co...>]

Author: phd
Date: Sat Apr 12 14:38:07 2014
New Revision: 4703

Log:
Adapt duplicate error message strings for SQLite 3.8

Modified:
   SQLObject/branches/1.5/docs/News.txt
   SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py

Modified: SQLObject/branches/1.5/docs/News.txt
==============================================================================
--- SQLObject/branches/1.5/docs/News.txt	Thu Jan 23 10:10:04 2014	(r4702)
+++ SQLObject/branches/1.5/docs/News.txt	Sat Apr 12 14:38:07 2014	(r4703)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 1.5.2
+===============
+
+* Adapt duplicate error message strings for SQLite 3.8.
+
 SQLObject 1.5.1
 ===============
 

Modified: SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py	Thu Jan 23 10:10:04 2014	(r4702)
+++ SQLObject/branches/1.5/sqlobject/sqlite/sqliteconnection.py	Sat Apr 12 14:38:07 2014	(r4703)
@@ -210,7 +210,8 @@
             raise OperationalError(ErrorMessage(e))
         except self.module.IntegrityError, e:
             msg = ErrorMessage(e)
-            if msg.startswith('column') and msg.endswith('not unique'):
+            if msg.startswith('column') and msg.endswith('not unique') \
+            or msg.startswith('UNIQUE constraint failed:'):
                 raise DuplicateEntryError(msg)
             else:
                 raise IntegrityError(msg)