mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

queryset-refactor: Fixed some missing imports from [7470]. Thanks, Justin Bronn.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-04-27 00:29:58 +00:00
parent 177f7d5164
commit 4a5c5c78f2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,8 +26,6 @@ def query_class(QueryClass, Database):
class OracleQuery(QueryClass): class OracleQuery(QueryClass):
def resolve_columns(self, row, fields=()): def resolve_columns(self, row, fields=()):
from django.db.models.fields import DateField, DateTimeField, \
TimeField, BooleanField, NullBooleanField, DecimalField, Field
index_start = len(self.extra_select.keys()) index_start = len(self.extra_select.keys())
values = [self.convert_values(v, None) for v in row[:index_start]] values = [self.convert_values(v, None) for v in row[:index_start]]
for value, field in map(None, row[index_start:], fields): for value, field in map(None, row[index_start:], fields):
@ -35,6 +33,8 @@ def query_class(QueryClass, Database):
return values return values
def convert_values(self, value, field): def convert_values(self, value, field):
from django.db.models.fields import DateField, DateTimeField, \
TimeField, BooleanField, NullBooleanField, DecimalField, Field
if isinstance(value, Database.LOB): if isinstance(value, Database.LOB):
value = value.read() value = value.read()
# Oracle stores empty strings as null. We need to undo this in # Oracle stores empty strings as null. We need to undo this in