test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Matt Boersma 2009-05-11 17:29:08 +00:00
parent 14a6f6cf9a
commit 369568b8c7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/backends/oracle/query.py
View File

@ -51,14 +51,14 @@ def query_class(QueryClass, Database):
for v in row[rn_offset:index_start]] for v in row[rn_offset:index_start]]
for value, field in map(None, row[index_start:], fields): for value, field in map(None, row[index_start:], fields):
values.append(self.convert_values(value, field)) values.append(self.convert_values(value, field))
return values return tuple(values)
def convert_values(self, value, field): def convert_values(self, value, field):
if isinstance(value, Database.LOB): if isinstance(value, Database.LOB):
value = value.read() value = value.read()
if field and field.get_internal_type() == 'TextField': if field and field.get_internal_type() == 'TextField':
value = force_unicode(value) value = force_unicode(value)
# Oracle stores empty strings as null. We need to undo this in # Oracle stores empty strings as null. We need to undo this in
# order to adhere to the Django convention of using the empty # order to adhere to the Django convention of using the empty
# string instead of null, but only if the field accepts the # 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) klass = query_class(QueryClass, cx_Oracle)
return klass.__new__(klass) return klass.__new__(klass)
unpickle_query_class.__safe_for_unpickling__ = True unpickle_query_class.__safe_for_unpickling__ = True