summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Boersma <matt@sprout.org>2009-05-11 17:29:08 +0000
committerMatt Boersma <matt@sprout.org>2009-05-11 17:29:08 +0000
commit369568b8c76dc463ed6f392e2efe874cbab04690 (patch)
tree7b9af72d2e670889674d2b3d48d7d7431f50145c
parent14a6f6cf9a44f0e8f088633d36cc2794c0b27e97 (diff)
Fixed #11051 -- Oracle passes null_fk unit tests in trunk again. Thanks, JirkaV.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/oracle/query.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/django/db/backends/oracle/query.py b/django/db/backends/oracle/query.py
index 22ef1359a3..7be9533e34 100644
--- a/django/db/backends/oracle/query.py
+++ b/django/db/backends/oracle/query.py
@@ -51,14 +51,14 @@ def query_class(QueryClass, Database):
for v in row[rn_offset:index_start]]
for value, field in map(None, row[index_start:], fields):
values.append(self.convert_values(value, field))
- return values
+ return tuple(values)
def convert_values(self, value, field):
if isinstance(value, Database.LOB):
value = value.read()
if field and field.get_internal_type() == 'TextField':
value = force_unicode(value)
-
+
# Oracle stores empty strings as null. We need to undo this in
# order to adhere to the Django convention of using the empty
# string instead of null, but only if the field accepts the
@@ -148,4 +148,3 @@ def unpickle_query_class(QueryClass):
klass = query_class(QueryClass, cx_Oracle)
return klass.__new__(klass)
unpickle_query_class.__safe_for_unpickling__ = True
-