summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Kelly <ian.g.kelly@gmail.com>2009-02-11 00:16:44 +0000
committerIan Kelly <ian.g.kelly@gmail.com>2009-02-11 00:16:44 +0000
commitc2838753894cbed7ee73c0fa85efa6b87c605598 (patch)
tree36dd134f6de4cb4ea39a17ca171b4cf9c53e422e
parentb0fd405c28cea9edb1a91416b540eed3eba0bfac (diff)
[1.0.X] Fixed #10224: Don't attempt to decode binary string data in the Oracle backend. Backport of [9821] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/oracle/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 38f51a707f..70d1e9b803 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -444,7 +444,8 @@ class FormatStylePlaceholderCursor(object):
value = Decimal(value)
else:
value = int(value)
- else:
+ elif desc[1] in (Database.STRING, Database.FIXED_CHAR,
+ Database.LONG_STRING):
value = to_unicode(value)
casted.append(value)
return tuple(casted)