Commit 251f345d authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

[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 ce094e57
parent 8a99d718
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -224,7 +224,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)