Changeset 7741

Timestamp:

06/25/08 20:02:11 (5 months ago)

Author:

mtredinnick

Message:

Fixed a problem when constructing complex select_related() calls.

Avoids joining with the wrong tables when connecting select_related() tables to
the main query. This also leads to slightly more efficient (meaning less tables
are joined) SQL queries in some other cases, too. Some unnecessary tables are
now trimmed that were not previously.

Files:

• django/trunk/django/db/models/sql/query.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/queries/models.py (modified) (2 diffs)

django/trunk/django/db/models/sql/query.py

@@ -632 +632 @@
-            # add_filter, since the final column might not otherwise be part of
-            # the select set (so we can't order on it).
-
-
+
+
+
+
-                self.unref_alias(alias)
-                alias = join[LHS_ALIAS]
@@ -831 +833 @@
-            for alias in self.join_map.get(t_ident, ()):
-                if alias not in exclusions:
+                    if lhs_table and not self.alias_refcount[self.alias_map[alias][LHS_ALIAS]]:
+                        # The LHS of this join tuple is no longer part of the
+                        # query, so skip this possibility.
+                        continue
-                    self.ref_alias(alias)
-                    if promote:
@@ -990 +996 @@
-        alias = join_list[-1]
-
-if
+while
-            # An optimization: if the final join is against the same column as
-            # we are comparing against, we can go back one step in the join
-
-
+
+
+
-            join = self.alias_map[alias]
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        if (lookup_type == 'isnull' and value is True and not negate and

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

@@ -135 +135 @@
-    def __unicode__(self):
-        return self.data
+
+# An inter-related setup with multiple paths from Child to Detail.
+class Detail(models.Model):
+    data = models.CharField(max_length=10)
+
+class MemberManager(models.Manager):
+    def get_query_set(self):
+        return super(MemberManager, self).get_query_set().select_related("details")
+
+class Member(models.Model):
+    name = models.CharField(max_length=10)
+    details = models.OneToOneField(Detail, primary_key=True)
+
+    objects = MemberManager()
+
+class Child(models.Model):
+    person = models.OneToOneField(Member, primary_key=True)
+    parent = models.ForeignKey(Member, related_name="children")
-
-
@@ -721 +739 @@
-[u'e1', u'e2', None]
-
+Similarly for select_related(), joins beyond an initial nullable join must
+use outer joins so that all results are included.
+>>> Report.objects.select_related("creator", "creator__extra").order_by("name")
+[<Report: r1>, <Report: r2>, <Report: r3>]
+
+When there are multiple paths to a table from another table, we have to be
+careful not to accidentally reuse an inappropriate join when using
+select_related(). We used to return the parent's Detail record here by mistake.
+
+>>> d1 = Detail.objects.create(data="d1")
+>>> d2 = Detail.objects.create(data="d2")
+>>> m1 = Member.objects.create(name="m1", details=d1)
+>>> m2 = Member.objects.create(name="m2", details=d2)
+>>> c1 = Child.objects.create(person=m2, parent=m1)
+>>> obj = m1.children.select_related("person__details")[0]
+>>> obj.person.details.data
+u'd2'
+
-"""}
-