Thread: [SQL-CVS] r4704 - in SQLObject/branches/1.6: docs sqlobject/sqlite
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2014-04-12 21:19:52
|
Author: phd Date: Sat Apr 12 14:43:56 2014 New Revision: 4704 Log: Merge revision 4703 from branch 1.5 Adapt duplicate error message strings for SQLite 3.8. Modified: SQLObject/branches/1.6/docs/News.txt SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py Modified: SQLObject/branches/1.6/docs/News.txt ============================================================================== --- SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:38:07 2014 (r4703) +++ SQLObject/branches/1.6/docs/News.txt Sat Apr 12 14:43:56 2014 (r4704) @@ -26,6 +26,11 @@ * Upgrade ez_setup to 1.4.2. +SQLObject 1.5.2 +=============== + +* Adapt duplicate error message strings for SQLite 3.8. + SQLObject 1.5.1 =============== Modified: SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py ============================================================================== --- SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:38:07 2014 (r4703) +++ SQLObject/branches/1.6/sqlobject/sqlite/sqliteconnection.py Sat Apr 12 14:43:56 2014 (r4704) @@ -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) |