@@ -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 django/db/backends/oracle/query.py ecae11e284e5978d0eba5331ade1f014a4cfc88c mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37 http://github.com/tswicegood/django/commit/f420bfb696ffbb56df860d5ae1e45dcef41969f2 f420bfb696ffbb56df860d5ae1e45dcef41969f2 2008-04-26T17:29:58-07:00 2008-04-26T17:29:58-07:00 queryset-refactor: Fixed some missing imports from [7470]. Thanks, Justin Bronn. git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7475 bcc190cf-cafb-0310-a4f2-bffc1f526a37 4b764bfcb43619bbcad478d198980c0d23e0079f mtredinnick mtredinnick@bcc190cf-cafb-0310-a4f2-bffc1f526a37