Ticket #7087: orcl_convert_values.diff

django/db/backends/oracle/query.py

@@ -26 +26 @@
 
     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 +33 @@
             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