innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #28932 -- Prevented Oracle from truncating trailing zeros in the fractional part of DecimalField. 

Fixes the test added in 6fd6d8383f.
Regression in 7c1f3901bc.
This commit is contained in:
Sergey Fedoseev 2017-12-20 21:55:51 +05:00 committed by Tim Graham
parent fc9eec7bb7
commit c8a85e3e91
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/db/backends/oracle/base.py
View File

@ -401,6 +401,14 @@ class FormatStylePlaceholderCursor:
def _output_number_converter(value): def _output_number_converter(value):
return decimal.Decimal(value) if '.' in value else int(value) return decimal.Decimal(value) if '.' in value else int(value)
@staticmethod
def _get_decimal_converter(precision, scale):
if scale == 0:
return int
context = decimal.Context(prec=precision)
quantize_value = decimal.Decimal(1).scaleb(-scale)
return lambda v: decimal.Decimal(v).quantize(quantize_value, context=context)
@staticmethod @staticmethod
def _output_type_handler(cursor, name, defaultType, length, precision, scale): def _output_type_handler(cursor, name, defaultType, length, precision, scale):
""" """
@ -421,7 +429,7 @@ class FormatStylePlaceholderCursor:
elif precision > 0: elif precision > 0:
# NUMBER(p,s) column: decimal-precision fixed point. # NUMBER(p,s) column: decimal-precision fixed point.
# This comes from IntegerField and DecimalField columns. # This comes from IntegerField and DecimalField columns.
outconverter = int if scale == 0 else decimal.Decimal outconverter = FormatStylePlaceholderCursor._get_decimal_converter(precision, scale)
else: else:
# No type information. This normally comes from a # No type information. This normally comes from a
# mathematical expression in the SELECT list. Guess int # mathematical expression in the SELECT list. Guess int