Changeset 8442

Timestamp:

08/19/08 09:17:24 (3 months ago)

Author:

russellm

Message:

Fixed #7908: Added validation checks on attempts to create ForeignKey? and M2M relations with abstract classes. Thanks to Rock Howard for the report.

Files:

• django/trunk/django/core/management/validation.py (modified) (2 diffs)
• django/trunk/django/db/models/fields/related.py (modified) (2 diffs)
• django/trunk/tests/modeltests/invalid_models/models.py (modified) (4 diffs)

django/trunk/django/core/management/validation.py

@@ -69 +69 @@
-            if f.rel:
-                if f.rel.to not in models.get_models():
-relation with model %s, which has not been installed
+a relation with model %s, which has either not been installed or is abstract.
-                # it is a string and we could not find the model it refers to
-                # so skip the next section
@@ -106 +106 @@
-            # objects
-            if f.rel.to not in models.get_models():
-m2m relation with model %s, which has not been installed
+an m2m relation with model %s, which has either not been installed or is abstract.
-                # it is a string and we could not find the model it refers to
-                # so skip the next section

django/trunk/django/db/models/fields/related.py

@@ -647 +647 @@
-            assert isinstance(to, basestring), "%s(%r) is invalid. First parameter to ForeignKey must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT)
-        else:
+            assert not to._meta.abstract, "%s cannot define a relation with abstract class %s" % (self.__class__.__name__, to._meta.object_name)
-            to_field = to_field or to._meta.pk.name
-        kwargs['verbose_name'] = kwargs.get('verbose_name', None)
@@ -757 +758 @@
-class ManyToManyField(RelatedField, Field):
-    def __init__(self, to, **kwargs):
+        try:
+            assert not to._meta.abstract, "%s cannot define a relation with abstract class %s" % (self.__class__.__name__, to._meta.object_name)
+        except AttributeError: # to._meta doesn't exist, so it must be RECURSIVE_RELATIONSHIP_CONSTANT
+            assert isinstance(to, basestring), "%s(%r) is invalid. First parameter to ManyToManyField must be either a model, a model name, or the string %r" % (self.__class__.__name__, to, RECURSIVE_RELATIONSHIP_CONSTANT)
+
-        kwargs['verbose_name'] = kwargs.get('verbose_name', None)
-        kwargs['rel'] = ManyToManyRel(to,

django/trunk/tests/modeltests/invalid_models/models.py

@@ -6 +6 @@
-
-from django.db import models
-
+
-class FieldErrors(models.Model):
-    charfield = models.CharField()
@@ -169 +169 @@
-    date_added = models.DateTimeField()
-
+class AbstractModel(models.Model):
+    name = models.CharField(max_length=10)
+    class Meta:
+        abstract = True
+
+class AbstractRelationModel(models.Model):
+    fk1 = models.ForeignKey('AbstractModel')
+    fk2 = models.ManyToManyField('AbstractModel')
+    
-model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute.
-invalid_models.fielderrors: "decimalfield": DecimalFields require a "decimal_places" attribute.
@@ -251 +260 @@
-invalid_models.selfclashm2m: Reverse query name for m2m field 'm2m_3' clashes with field 'SelfClashM2M.selfclashm2m'. Add a related_name argument to the definition for 'm2m_3'.
-invalid_models.selfclashm2m: Reverse query name for m2m field 'm2m_4' clashes with field 'SelfClashM2M.selfclashm2m'. Add a related_name argument to the definition for 'm2m_4'.
-2' has m2m relation with model Rel2, which has not been installed
-1' has relation with model Rel1, which has not been installed
+1' has a relation with model Rel1, which has either not been installed or is abstract.
+2' has an m2m relation with model Rel2, which has either not been installed or is abstract.
-invalid_models.grouptwo: 'primary' has a manually-defined m2m relation through model Membership, which does not have foreign keys to Person and GroupTwo
-invalid_models.grouptwo: 'secondary' has a manually-defined m2m relation through model MembershipMissingFK, which does not have foreign keys to Group and GroupTwo
@@ -261 +270 @@
-invalid_models.personselfrefm2m: Intermediary model RelationshipTripleFK has more than two foreign keys to PersonSelfRefM2M, which is ambiguous and is not permitted.
-invalid_models.personselfrefm2mexplicit: Many-to-many fields with intermediate tables cannot be symmetrical.
+invalid_models.abstractrelationmodel: 'fk1' has a relation with model AbstractModel, which has either not been installed or is abstract.
+invalid_models.abstractrelationmodel: 'fk2' has an m2m relation with model AbstractModel, which has either not been installed or is abstract.
-"""