Ticket #9055: 9055-2.diff

django/db/backends/__init__.py

@@ -589 +589 @@
         to_unicode = lambda s: force_unicode(s, strings_only=True, errors='replace')
         if isinstance(params, (list, tuple)):
             u_params = tuple([to_unicode(val) for val in params])
+        elif params is None:
+            u_params = ()
         else:
             u_params = dict([(to_unicode(k), to_unicode(v)) for k, v in params.items()])
 

django/db/backends/util.py

@@ -30 +30 @@
 
 class CursorDebugWrapper(CursorWrapper):
 
-    def execute(self, sql, params=()):
+    def execute(self, sql, params=None):
         start = time()
         try:
-            return self.cursor.execute(sql, params)
+            if params is None:
+                # params default might be backend specific
+                return self.cursor.execute(sql)
+            else:
+                return self.cursor.execute(sql, params)
         finally:
             stop = time()
             duration = stop - start

tests/regressiontests/backends/tests.py

@@ -14 +14 @@
 from django.db.backends.postgresql_psycopg2 import version as pg_version
 from django.db.utils import ConnectionHandler, DatabaseError, load_backend
 from django.test import TestCase, skipUnlessDBFeature, TransactionTestCase
+from django.test.utils import override_settings
 from django.utils import unittest
 
 from . import models
@@ -294 +295 @@
 
 
 class EscapingChecks(TestCase):
-
+    """ Each test is run once with normal cursor, and once with
+        CursorDebugWrapper activated by setting DEBUG to True
+    """
     @unittest.skipUnless(connection.vendor == 'sqlite',
                          "This is a sqlite-specific issue")
     def test_parameter_escaping(self):
@@ -306 +309 @@
         # response should be an non-zero integer
         self.assertTrue(int(response))
 
+    @unittest.skipUnless(connection.vendor == 'sqlite',
+                         "This is a sqlite-specific issue")
+    @override_settings(DEBUG=True)
+    def test_parameter_escaping_debug(self):
+        self.test_parameter_escaping()
+
+    @unittest.skipUnless(connection.vendor == 'mysql',
+                         "This is a mysql-specific test")
+    def test_parameter_escaping_mysql(self):
+        cursor = connection.cursor()
+        response = cursor.execute("SELECT DATE_FORMAT(NOW(), '%%Y-%%m-%%e')")
+        self.assertTrue(len(cursor.fetchall()[0][0]) > 6)
+
+    @unittest.skipUnless(connection.vendor == 'mysql',
+                         "This is a mysql-specific test")
+    @override_settings(DEBUG=True)
+    def test_parameter_escaping_mysql_debug(self):
+        self.test_parameter_escaping_mysql()
+
 
 class BackendTestCase(TestCase):
     def test_cursor_executemany(self):