Ticket #12404: 12404_new.diff

django/core/management/validation.py

@@ -37 +37 @@
                 e.add(opts, '"%s": You can\'t use "id" as a field name, because each model automatically gets an "id" field if none of the fields have primary_key=True. You need to either remove/rename your "id" field or add primary_key=True to a field.' % f.name)
             if f.name.endswith('_'):
                 e.add(opts, '"%s": Field names cannot end with underscores, because this would lead to ambiguous queryset filters.' % f.name)
-            if isinstance(f, models.CharField) and f.max_length in (None, 0):
-                e.add(opts, '"%s": CharFields require a "max_length" attribute.' % f.name)
+            if isinstance(f, models.CharField):
+                try:
+                    max_length = int(f.max_length)
+                    if max_length <= 0:
+                        e.add(opts, '"%s": CharFields require a "max_length attribute greater than zero."' % f.name)
+                except ValueError:
+                    e.add(opts, '"%s": CharFields require a "max_length" attribute of type int.' % f.name)
+                except TypeError:
+                    if f.max_length is None:
+                        e.add(opts, '"%s": CharFields require a "max_length" attribute.' % f.name)
+                    else:
+                        e.add(opts, '"%s": CharFields require a "max_length" attribute of type int.' % f.name)
+                    
             if isinstance(f, models.DecimalField):
                 if f.decimal_places is None:
                     e.add(opts, '"%s": DecimalFields require a "decimal_places" attribute.' % f.name)

tests/modeltests/invalid_models/models.py

@@ -8 +8 @@
 
 class FieldErrors(models.Model):
     charfield = models.CharField()
+    badmax = models.CharField(max_length="cheese")
+    badtype = models.CharField(max_length=type)
     decimalfield = models.DecimalField()
     filefield = models.FileField()
     choices = models.CharField(max_length=10, choices='bad')
@@ -184 +186 @@
 
 
 model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute.
+invalid_models.fielderrors: "badmax": CharFields require a "max_length" attribute of type int.
+invalid_models.fielderrors: "badtype": CharFields require a "max_length" attribute of type int.
 invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute.
 invalid_models.fielderrors: "decimalfield": DecimalFields require a "max_digits" attribute.
 invalid_models.fielderrors: "filefield": FileFields require an "upload_to" attribute.