From ce094e570e0ff085b88b2303e25124331f558e45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anssi=20K=C3=A4=C3=A4ri=C3=A4inen?= Date: Sat, 23 Feb 2013 00:27:39 +0200 Subject: [PATCH] Fixed Oracle regression in last_executed_query() with unicode strings The regression was likely caused by the fix in #19606 which adjusted Oracle's unicode detection, though it seems this would have been an issue in some configurations even before. --- django/db/backends/oracle/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index a9ae025146..3c799f01c1 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -270,7 +270,8 @@ WHEN (new.%(col_name)s IS NULL) if six.PY3: return cursor.statement else: - return cursor.statement.decode("utf-8") + query = cursor.statement + return query if isinstance(query, unicode) else query.decode("utf-8") def last_insert_id(self, cursor, table_name, pk_name): sq_name = self._get_sequence_name(table_name)