Changeset 7764

Timestamp:

06/26/08 05:50:25 (2 months ago)

Author:

mtredinnick

Message:

Fixed the way symmetrical many-to-many relations are recorded in the Options class.

These types of relations don't have reverse accessor names, so that name can be
used by a normal field on the model. Fixed #7107.

Files:

• django/trunk/django/db/models/options.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (2 diffs)

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

@@ -275 +275 @@
-        Initialises the field name -> field object mapping.
-        """
-
-
-
-
+
+
+
-        for f, model in self.get_all_related_m2m_objects_with_model():
-            cache[f.field.related_query_name()] = (f, model, False, True)
-        for f, model in self.get_all_related_objects_with_model():
-            cache[f.field.related_query_name()] = (f, model, False, False)
+        for f, model in self.get_m2m_with_model():
+            cache[f.name] = (f, model, True, True)
+        for f, model in self.get_fields_with_model():
+            cache[f.name] = (f, model, True, False)
-        if self.order_with_respect_to:
-            cache['_order'] = OrderWrt(), None, True, False

django/trunk/tests/regressiontests/queries/models.py

@@ -90 +90 @@
-    def __unicode__(self):
-        return unicode(self.num)
+
+# Symmetrical m2m field with a normal field using the reverse accesor name
+# ("valid").
+class Valid(models.Model):
+    valid = models.CharField(max_length=10)
+    parent = models.ManyToManyField('self')
+
+    class Meta:
+        ordering = ['valid']
-
-# Some funky cross-linked models for testing a couple of infinite recursion
@@ -769 +778 @@
-5
-
+Bug #7107 -- this shouldn't create an infinite loop.
+>>> Valid.objects.all()
+[]
+
-"""}
-