Ticket #5079: 5079.3.diff

django/db/models/fields/__init__.py

@@ -686 +686 @@
         if value < 0:
             num_chars += 1
 
-        return u"%.*f" % (self.decimal_places, value)
+        if isinstance(value, decimal.Decimal):
+            return value.quantize(decimal.Decimal('.1')**self.decimal_places)
+        else:
+            return u"%.*f" % (self.decimal_places, value)
 
     def get_db_prep_save(self, value):
         if value is not None:

tests/regressiontests/model_fields/tests.py

@@ -1 @@
-"""
+
+
+from django.db import models
+from decimal import Decimal
+
+class DecimalTest(models.Model):
+    field = models.DecimalField(max_digits=40, decimal_places=25)
+    
+
+__test__ = {'API_TESTS': """
 >>> from django.db.models.fields import *
 
 # DecimalField
@@ -15 +24 @@
 Traceback (most recent call last):
 ...
 ValidationError: [u'This value must be a decimal number.']
-"""
+
+# added after #5079 
+>>> b1 = DecimalTest(field=Decimal(".1"))
+>>> b1.field
+Decimal("0.1")
+>>> b1.save()
+>>> b1.field
+Decimal("0.1")
+
+# had to strip because mysql would return decimals with lots of 0000 at the end
+>>> str(DecimalTest.objects.get(id=1).field).rstrip('0')
+'0.1'
+
+>>> b1 = DecimalTest(field=Decimal(".10000000000000000000000000000000005"))
+>>> b1.field
+Decimal("0.10000000000000000000000000000000005")
+>>> b1.save()
+>>> b1.field
+Decimal("0.10000000000000000000000000000000005")
+
+# had to strip because mysql would return decimals with lots of 0000 at the end
+>>> str(DecimalTest.objects.get(id=2).field).rstrip('0')
+'0.1'
+"""}