Changeset 6835

Timestamp:

12/02/07 12:10:07 (7 months ago)

Author:

mtredinnick

Message:

Fixed #3323 -- More robust error handling for related objetcs. Thanks, Greg
Kopka and shaleh.

Files:

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

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

@@ -73 +73 @@
-            # existing fields, m2m fields, m2m related objects or related objects
-            if f.rel:
+                if f.rel.to not in models.get_models():
+                    e.add(opts, "'%s' has relation with model %s, which has not been installed" % (f.name, f.rel.to))
+                # it is a string and we could not find the model it refers to
+                # so skip the next section
+                if isinstance(f.rel.to, (str, unicode)):
+                    continue
+
-                rel_opts = f.rel.to._meta
-                if f.rel.to not in models.get_models():
-                    e.add(opts, "'%s' has relation with model %s, which has not been installed" % (f.name, rel_opts.object_name))
-
-                rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()
-                rel_query_name = f.related_query_name()
@@ -104 +108 @@
-            # Check to see if the related m2m field will clash with any
-            # existing fields, m2m fields, m2m related objects or related objects
+            if f.rel.to not in models.get_models():
+                e.add(opts, "'%s' has m2m relation with model %s, which has not been installed" % (f.name, f.rel.to))
+                # it is a string and we could not find the model it refers to
+                # so skip the next section
+                if isinstance(f.rel.to, (str, unicode)):
+                    continue
+
-            rel_opts = f.rel.to._meta
-            if f.rel.to not in models.get_models():
-                e.add(opts, "'%s' has m2m relation with model %s, which has not been installed" % (f.name, rel_opts.object_name))
-
-            rel_name = RelatedObject(f.rel.to, cls, f).get_accessor_name()
-            rel_query_name = f.related_query_name()

django/trunk/django/db/models/options.py

@@ -153 +153 @@
-            for klass in get_models():
-                for f in klass._meta.fields:
-
+not isinstance(f.rel.to, str) and 
-                        rel_objs.append(RelatedObject(f.rel.to, klass, f))
-            self._all_related_objects = rel_objs
@@ -187 +187 @@
-            for klass in get_models():
-                for f in klass._meta.many_to_many:
-
+not isinstance(f.rel.to, str) and 
-                        rel_objs.append(RelatedObject(f.rel.to, klass, f))
-            if app_cache_ready():

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

@@ -108 +108 @@
-    colour = models.CharField(max_length=5)
-    model = models.ForeignKey(Model)
+
+class MissingRelations(models.Model):
+    rel1 = models.ForeignKey("Rel1")
+    rel2 = models.ManyToManyField("Rel2")
-
-model_errors = """invalid_models.fielderrors: "charfield": CharFields require a "max_length" attribute.
@@ -192 +196 @@
-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'.
+invalid_models.missingrelations: 'rel2' has m2m relation with model Rel2, which has not been installed
+invalid_models.missingrelations: 'rel1' has relation with model Rel1, which has not been installed
-"""