From cd4686304344529538470481ddd452d2534650ae Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sat, 7 Jan 2012 21:42:37 +0000 Subject: [PATCH] Added missing bits of r17352. Refs #17513. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17353 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/backends/mysql/base.py | 2 +- docs/releases/1.4.txt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 02bdda199b7..830808b9d34 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -105,7 +105,7 @@ class CursorWrapper(object): # misclassified and Django would prefer the more logical place. if e[0] in self.codes_for_integrityerror: raise utils.IntegrityError, utils.IntegrityError(*tuple(e)), sys.exc_info()[2] - raise + raise utils.DatabaseError, utils.DatabaseError(*tuple(e)), sys.exc_info()[2] except Database.DatabaseError, e: raise utils.DatabaseError, utils.DatabaseError(*tuple(e)), sys.exc_info()[2] diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt index 9f9ce7fb59b..d4c723fea52 100644 --- a/docs/releases/1.4.txt +++ b/docs/releases/1.4.txt @@ -745,6 +745,15 @@ datetimes are now stored without time-zone information in SQLite. When :setting:`USE_TZ` is ``False``, if you attempt to save an aware datetime object, Django raises an exception. +``MySQLdb``-specific exceptions +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The MySQL backend could raise :class:`MySQLdb.OperationalError` +when a query triggered an exception. This bug was fixed and +:class:`django.db.utils.DatabaseError` is now raised instead. +If you were testing for :class:`MySQLdb.OperationalError`, +you must update your ``except`` clauses. + Database connection's thread-locality ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~