Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Fixed #11051 -- Oracle passes null_fk unit tests in trunk again. Than…

…ks, JirkaV.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 369568b8c76dc463ed6f392e2efe874cbab04690 1 parent 14a6f6c
@mboersma mboersma authored
Showing with 2 additions and 3 deletions.
  1. +2 −3 django/db/backends/oracle/
5 django/db/backends/oracle/
@@ -51,14 +51,14 @@ def resolve_columns(self, row, fields=()):
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 =
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

0 comments on commit 369568b

Please sign in to comment.
Something went wrong with that request. Please try again.