Ticket #19954: 19954-1.diff

django/db/backends/mysql/base.py

@@ -269 +269 @@
         # With MySQLdb, cursor objects have an (undocumented) "_last_executed"
         # attribute where the exact query sent to the database is saved.
         # See MySQLdb/cursors.py in the source distribution.
-        return cursor._last_executed.decode('utf-8')
+        def to_unicode(chunk):
+            try:
+                return chunk.decode('utf-8')
+            except UnicodeDecodeError:
+                return chunk.decode('unicode-escape')
+        try:
+            return cursor._last_executed.decode('utf-8')
+        except UnicodeDecodeError:
+            return ' '.join(to_unicode(chunk) for chunk in cursor._last_executed.split(b' '))
 
     def no_limit_value(self):
         # 2**64 - 1, as recommended by the MySQL documentation

tests/backends/models.py

@@ -62 +62 @@
 class Reporter(models.Model):
     first_name = models.CharField(max_length=30)
     last_name = models.CharField(max_length=30)
+    raw_data = models.BinaryField()
 
     def __str__(self):
         return "%s %s" % (self.first_name, self.last_name)

tests/backends/tests.py

@@ -157 +157 @@
 class LastExecutedQueryTest(TestCase):
 
     def test_debug_sql(self):
-        list(models.Tag.objects.filter(name="test"))
+        list(models.Reporter.objects.filter(first_name="test"))
         sql = connection.queries[-1]['sql'].lower()
         self.assertIn("select", sql)
-        self.assertIn(models.Tag._meta.db_table, sql)
+        self.assertIn(models.Reporter._meta.db_table, sql)
 
     def test_query_encoding(self):
         """
         Test that last_executed_query() returns an Unicode string
         """
-        tags = models.Tag.objects.extra(select={'föö': 1})
-        sql, params = tags.query.sql_with_params()
-        cursor = tags.query.get_compiler('default').execute_sql(None)
+        persons = models.Reporter.objects.filter(raw_data=b'\x00\x46  \xFE').extra(select={'föö': 1})
+        sql, params = persons.query.sql_with_params()
+        cursor = persons.query.get_compiler('default').execute_sql(None)
         last_sql = cursor.db.ops.last_executed_query(cursor, sql, params)
         self.assertTrue(isinstance(last_sql, six.text_type))