[SQL-CVS] r4706 - in SQLObject/trunk: docs sqlobject/sqlite

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

Author: phd
Date: Sat Apr 12 14:49:47 2014
New Revision: 4706

Log:
Merge revisions 4704, 4705 from branch 1.6

Adapt duplicate error message strings for SQLite 3.8.

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

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sat Apr 12 14:47:05 2014	(r4705)
+++ SQLObject/trunk/docs/News.txt	Sat Apr 12 14:49:47 2014	(r4706)
@@ -29,6 +29,13 @@
 
 * Upgrade ez_setup to 1.4.2.
 
+* A bugfix was ported from `SQLObject 1.5.2`_.
+
+SQLObject 1.5.2
+===============
+
+* Adapt duplicate error message strings for SQLite 3.8.
+
 SQLObject 1.5.1
 ===============
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sat Apr 12 14:47:05 2014	(r4705)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Sat Apr 12 14:49:47 2014	(r4706)
@@ -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)