summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-04-27 00:29:58 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-04-27 00:29:58 +0000
commit4a5c5c78f2ecd4ed8859cd5ac773ff3a01bccf96 (patch)
tree4b764bfcb43619bbcad478d198980c0d23e0079f
parent177f7d51647f4d6be6b840c32a4abbf460ed03be (diff)
downloaddjango-attic/queryset-refactor.tar.gz
queryset-refactor: Fixed some missing imports from [7470]. Thanks, Justin Bronn.archive/attic/queryset-refactorattic/queryset-refactor
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/db/backends/oracle/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/backends/oracle/query.py b/django/db/backends/oracle/query.py
index 1ec2336140..033ffe8533 100644
--- a/django/db/backends/oracle/query.py
+++ b/django/db/backends/oracle/query.py
@@ -26,8 +26,6 @@ def query_class(QueryClass, Database):
class OracleQuery(QueryClass):
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())
values = [self.convert_values(v, None) for v in row[:index_start]]
for value, field in map(None, row[index_start:], fields):
@@ -35,6 +33,8 @@ def query_class(QueryClass, Database):
return values
def convert_values(self, value, field):
+ from django.db.models.fields import DateField, DateTimeField, \
+ TimeField, BooleanField, NullBooleanField, DecimalField, Field
if isinstance(value, Database.LOB):
value = value.read()
# Oracle stores empty strings as null. We need to undo this in