Ticket #10224: django-oracle-binary.diff

django-trunk/django/db/backends/oracle/base.py

@@ -421 +421 @@
         # cursor description, and convert strings to unicode.
         casted = []
         for value, desc in zip(row, self.cursor.description):
-            if value is not None and desc[1] is Database.NUMBER:
-                precision, scale = desc[4:6]
-                if scale == -127:
-                    if precision == 0:
-                        # NUMBER column: decimal-precision floating point
-                        # This will normally be an integer from a sequence,
-                        # but it could be a decimal value.
-                        if '.' in value:
-                            value = Decimal(value)
+            if value is not None:
+                if desc[1] is Database.NUMBER:
+                    precision, scale = desc[4:6]
+                    if scale == -127:
+                        if precision == 0:
+                            # NUMBER column: decimal-precision floating point
+                            # This will normally be an integer from a sequence,
+                            # but it could be a decimal value.
+                            if '.' in value:
+                                value = Decimal(value)
+                            else:
+                                value = int(value)
                         else:
+                            # FLOAT column: binary-precision floating point.
+                            # This comes from FloatField columns.
+                            value = float(value)
+                    elif precision > 0:
+                        # NUMBER(p,s) column: decimal-precision fixed point.
+                        # This comes from IntField and DecimalField columns.
+                        if scale == 0:
                             value = int(value)
+                        else:
+                            value = Decimal(value)
+                    elif '.' in value:
+                        # No type information. This normally comes from a
+                        # mathematical expression in the SELECT list. Guess int
+                        # or Decimal based on whether it has a decimal point.
+                        value = Decimal(value)
                     else:
-                        # FLOAT column: binary-precision floating point.
-                        # This comes from FloatField columns.
-                        value = float(value)
-                elif precision > 0:
-                    # NUMBER(p,s) column: decimal-precision fixed point.
-                    # This comes from IntField and DecimalField columns.
-                    if scale == 0:
                         value = int(value)
-                    else:
-                        value = Decimal(value)
-                elif '.' in value:
-                    # No type information. This normally comes from a
-                    # mathematical expression in the SELECT list. Guess int
-                    # or Decimal based on whether it has a decimal point.
-                    value = Decimal(value)
-                else:
-                    value = int(value)
             else:
                 value = to_unicode(value)
             casted.append(value)