Ticket #7726: patch.diff

django/core/management/validation.py

@@ -67 +67 @@
                         e.add(opts,  mdigits_msg % f.name)
                 except (ValueError, TypeError):
                     e.add(opts, mdigits_msg % f.name)
+                improperly_configured_msg = '"%s": DecimalFields require a "max_digits" attribute that is higher than "decimal_places" attribute.'
+                try:
+                    max_digits = int(f.max_digits)
+                    decimal_places = int(f.decimal_places)
+                    if (max_digits > 0) and (decimal_places >=0):
+                        if not (max_digits > decimal_places):
+                            e.add(opts, improperly_configured_msg % f.name)
+                except (ValueError, TypeError):
+                    pass
             if isinstance(f, models.FileField) and not f.upload_to:
                 e.add(opts, '"%s": FileFields require an "upload_to" attribute.' % f.name)
             if isinstance(f, models.ImageField):

tests/modeltests/invalid_models/models.py

@@ -14 +14 @@
     decimalfield = models.DecimalField()
     decimalfield2 = models.DecimalField(max_digits=-1, decimal_places=-1)
     decimalfield3 = models.DecimalField(max_digits="bad", decimal_places="bad")
+    decimalfield4 = models.DecimalField(max_digits=9, decimal_places=10)
+    decimalfield5 = models.DecimalField(max_digits=10, decimal_places=10)
     filefield = models.FileField()
     choices = models.CharField(max_length=10, choices='bad')
     choices2 = models.CharField(max_length=10, choices=[(1,2,3),(1,2,3)])
@@ -241 +243 @@
 invalid_models.fielderrors: "decimalfield2": DecimalFields require a "max_digits" attribute that is a positive integer.
 invalid_models.fielderrors: "decimalfield3": DecimalFields require a "decimal_places" attribute that is a non-negative integer.
 invalid_models.fielderrors: "decimalfield3": DecimalFields require a "max_digits" attribute that is a positive integer.
+invalid_models.fielderrors: "decimalfield4": DecimalFields require a "max_digits" attribute that is higher than "decimal_places" attribute.
+invalid_models.fielderrors: "decimalfield5": DecimalFields require a "max_digits" attribute that is higher than "decimal_places" attribute.
 invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.
 invalid_models.fielderrors: "choices": "choices" should be iterable (e.g., a tuple or list).
 invalid_models.fielderrors: "choices2": "choices" should be a sequence of two-tuples.