summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShai Berger <shai@platonix.com>2013-07-08 23:47:02 +0300
committerClaude Paroz <claude@2xlibre.net>2013-07-09 19:52:16 +0200
commitae685e54cb8b5d654180ac66b9fd4d68ad28a66b (patch)
treef3447b6c91da4ffd3d276550bb4347ba4f158e32
parent7788c7189036bcd78692aaae1dd4260d7a7563bf (diff)
[1.6.x] Fixed last_executed_query test failure on Oracle
Backport of c0a4894dca from master.
-rw-r--r--django/db/backends/oracle/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 5e2b763f52..470ea779c3 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -267,7 +267,7 @@ WHEN (new.%(col_name)s IS NULL)
# http://cx-oracle.sourceforge.net/html/cursor.html#Cursor.statement
# The DB API definition does not define this attribute.
statement = cursor.statement
- if not six.PY3 and not isinstance(statement, unicode):
+ if statement and not six.PY3 and not isinstance(statement, unicode):
statement = statement.decode('utf-8')
# Unlike Psycopg's `query` and MySQLdb`'s `_last_executed`, CxOracle's
# `statement` doesn't contain the query parameters. refs #20010.