p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[1.5.x] 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.

Backpatch of ce094e570e
This commit is contained in:
Anssi Kääriäinen 2013-02-23 00:27:39 +02:00
parent 8a99d718f7
commit 251f345db6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/oracle/base.py
View File

@ -224,7 +224,8 @@ WHEN (new.%(col_name)s IS NULL)
if six.PY3: if six.PY3:
return cursor.statement return cursor.statement
else: 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): def last_insert_id(self, cursor, table_name, pk_name):
sq_name = self._get_sequence_name(table_name) sq_name = self._get_sequence_name(table_name)