Ticket #18461: 18461-1.diff

django/db/backends/mysql/base.py

@@ -238 +238 @@
         # 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
+        return cursor._last_executed.decode('utf-8')
 
     def no_limit_value(self):
         # 2**64 - 1, as recommended by the MySQL documentation

django/db/backends/postgresql_psycopg2/operations.py

@@ -193 +193 @@
     def last_executed_query(self, cursor, sql, params):
         # http://initd.org/psycopg/docs/cursor.html#cursor.query
         # The query attribute is a Psycopg extension to the DB API 2.0.
-        return cursor.query
+        return cursor.query.decode('utf-8')
 
     def return_insert_id(self):
         return "RETURNING %s", ()

tests/regressiontests/logging_tests/tests.py

@@ +1 @@
+# -*- encoding: utf-8 -*-
 from __future__ import unicode_literals
 
 import copy
@@ -252 +253 @@
 
         self.assertEqual(len(mail.outbox), 1)
         self.assertEqual(mail.outbox[0].subject, expected_subject)
+
+class RequestLoggingTest(TestCase):
+    @override_settings(DEBUG=True)
+    def test_sql_logging(self):
+        """
+        Test that sql logging of last executed query doesn't produce decoding
+        error with Unicode caracters (#18461)
+        """
+        from django.contrib.auth.models import User
+        q = list(User.objects.filter(last_name='й'))