Changeset 5076

Timestamp:

04/25/07 05:18:56 (2 years ago)

Author:

mtredinnick

Message:

Fixed #3450 -- Exposed IntegrityError in a backend-neutral fashion. This is a
useful error to be able to catch explicitly. Thanks, enlight.

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/trunk/django/db/__init__.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -86 +86 @@
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker
+    enlight
-    Enrico <rico.bl@gmail.com>
-    Ludvig Ericson <ludvig.ericson@gmail.com>

django/trunk/django/db/backends/ado_mssql/base.py

@@ -18 +18 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-# We need to use a special Cursor class because adodbapi expects question-mark

django/trunk/django/db/backends/dummy/base.py

@@ -14 +14 @@
-
-class DatabaseError(Exception):
+    pass
+
+class IntegrityError(DatabaseError):
-    pass
-

django/trunk/django/db/backends/mysql/base.py

@@ -26 +26 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-# MySQLdb-1.2.1 supports the Python boolean type, and only uses datetime

django/trunk/django/db/backends/mysql_old/base.py

@@ -17 +17 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-django_conversions = conversions.copy()

django/trunk/django/db/backends/oracle/base.py

@@ -13 +13 @@
-
-DatabaseError = Database.Error
+IntegrityError = Database.IntegrityError
-
-try:

django/trunk/django/db/backends/postgresql/base.py

@@ -13 +13 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-try:

django/trunk/django/db/backends/postgresql_psycopg2/base.py

@@ -13 +13 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-try:

django/trunk/django/db/backends/sqlite3/base.py

@@ -19 +19 @@
-
-DatabaseError = Database.DatabaseError
+IntegrityError = Database.IntegrityError
-
-Database.register_converter("bool", lambda s: str(s) == '1')

django/trunk/django/db/__init__.py

@@ -3 +3 @@
-from django.dispatch import dispatcher
-
-
+, 'IntegrityError'
-
-if not settings.DATABASE_ENGINE:
@@ -30 +30 @@
-connection = backend.DatabaseWrapper(**settings.DATABASE_OPTIONS)
-DatabaseError = backend.DatabaseError
+IntegrityError = backend.IntegrityError
-
-# Register an event that closes the database connection