Changeset 806

Timestamp:

10/08/05 16:00:25 (3 years ago)

Author:

adrian

Message:

Fixed #473 -- Added a MysqlDebugWrapper? to use for MySQL with DEBUG=True. It displays more informative error messages for MySQL warnings. Thanks for the patch, mlambert@gmail.com

Files:

• django/trunk/django/core/db/backends/mysql.py (modified) (2 diffs)

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

@@ -22 +22 @@
-})
-
+# This is an extra debug layer over MySQL queries, to display warnings.
+# It's only used when DEBUG=True.
+class MysqlDebugWrapper:
+    def __init__(self, cursor):
+        self.cursor = cursor
+
+    def execute(self, sql, params=()):
+        try:
+            return self.cursor.execute(sql, params)
+        except Database.Warning, w:
+            self.cursor.execute("SHOW WARNINGS")
+            raise Database.Warning, "%s: %s" % (w, self.cursor.fetchall())
+
+    def executemany(self, sql, param_list):
+        try:
+            return self.cursor.executemany(sql, param_list)
+        except Database.Warning:
+            self.cursor.execute("SHOW WARNINGS")
+            raise Database.Warning, "%s: %s" % (w, self.cursor.fetchall())
+
+    def __getattr__(self, attr):
+        if self.__dict__.has_key(attr):
+            return self.__dict__[attr]
+        else:
+            return getattr(self.cursor, attr)
+
-class DatabaseWrapper:
-    def __init__(self):
@@ -33 +59 @@
-                passwd=DATABASE_PASSWORD, host=DATABASE_HOST, conv=django_conversions)
-        if DEBUG:
-self.connection.cursor(
+MysqlDebugWrapper(self.connection.cursor()
-        return self.connection.cursor()
-