Author: mtredinnick
Date: 2011-08-23 16:43:29 -0700 (Tue, 23 Aug 2011)
New Revision: 16678
Modified:
django/trunk/django/core/management/validation.py
django/trunk/tests/modeltests/invalid_models/invalid_models/models.py
Log:
Teach "django-admin.py validate" to forbid nullable primary keys.
Fixes #15884, with thanks to JustinTArthur and Julie Pichon.
Modified: django/trunk/django/core/management/validation.py
===================================================================
--- django/trunk/django/core/management/validation.py 2011-08-23 15:57:19 UTC
(rev 16677)
+++ django/trunk/django/core/management/validation.py 2011-08-23 23:43:29 UTC
(rev 16678)
@@ -39,6 +39,8 @@
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 f.primary_key and f.null:
+ e.add(opts, '"%s": Primary key fields cannot have null=True.'
% f.name)
if isinstance(f, models.CharField):
try:
max_length = int(f.max_length)
Modified: django/trunk/tests/modeltests/invalid_models/invalid_models/models.py
===================================================================
--- django/trunk/tests/modeltests/invalid_models/invalid_models/models.py
2011-08-23 15:57:19 UTC (rev 16677)
+++ django/trunk/tests/modeltests/invalid_models/invalid_models/models.py
2011-08-23 23:43:29 UTC (rev 16678)
@@ -220,7 +220,8 @@
fk = models.ForeignKey('self', on_delete=models.SET_DEFAULT)
class UnicodeForeignKeys(models.Model):
- """Foreign keys which can translate to ascii should be OK, but fail if
they're not."""
+ """Foreign keys which can translate to ascii should be OK, but fail if
+ they're not."""
good = models.ForeignKey(u'FKTarget')
also_good = models.ManyToManyField(u'FKTarget', related_name='unicode2')
@@ -228,7 +229,10 @@
# when adding the errors in core/management/validation.py
#bad = models.ForeignKey(u'★')
+class PrimaryKeyNull(models.Model):
+ my_pk_field = models.IntegerField(primary_key=True, null=True)
+
model_errors = """invalid_models.fielderrors: "charfield": CharFields require
a "max_length" attribute that is a positive integer.
invalid_models.fielderrors: "charfield2": CharFields require a "max_length"
attribute that is a positive integer.
invalid_models.fielderrors: "charfield3": CharFields require a "max_length"
attribute that is a positive integer.
@@ -338,4 +342,5 @@
invalid_models.nonexistingorderingwithsingleunderscore: "ordering" refers to
"does_not_exist", a field that doesn't exist.
invalid_models.invalidsetnull: 'fk' specifies on_delete=SET_NULL, but cannot
be null.
invalid_models.invalidsetdefault: 'fk' specifies on_delete=SET_DEFAULT, but
has no default value.
+invalid_models.primarykeynull: "my_pk_field": Primary key fields cannot have
null=True.
"""
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
