Changeset 7740

Timestamp:

06/25/08 20:01:21 (3 months ago)

Author:

mtredinnick

Message:

Fixed a problem with values() and values_list() queries and nullable joins.

Previously, if we were querying across a nullable join and then a non-nullable
one, the second join would not be a LEFT OUTER join, which would exclude
certain valid results from the result set.

This is the same problem as [7597] but for values() field specifications, so
this covers the second case where Django adds extra stuff to the select-clause.

Files:

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

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

@@ -680 +680 @@
-        False, the join is only promoted if it is nullable, otherwise it is
-        always promoted.
+
+        Returns True if the join was promoted.
-        """
-        if ((unconditional or self.alias_map[alias][NULLABLE]) and
@@ -686 +688 @@
-            data[JOIN_TYPE] = self.LOUTER
-            self.alias_map[alias] = tuple(data)
+            return True
+        return False
-
-    def change_aliases(self, change_map):
@@ -1295 +1299 @@
-                        col = join[LHS_JOIN_COL]
-                        joins = joins[:-1]
+                promote = False
-                for join in joins[1:]:
-                    # Only nullable aliases are promoted, so we don't end up
-                    # doing unnecessary left outer joins here.
-
+
+
-                self.select.append((final_alias, col))
-                self.select_fields.append(field)

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

@@ -59 +59 @@
-class Report(models.Model):
-    name = models.CharField(max_length=10)
-
+, null=True
-
-    def __unicode__(self):
@@ -192 +192 @@
->>> r2 = Report(name='r2', creator=a3)
->>> r2.save()
+>>> r3 = Report(name='r3')
+>>> r3.save()
-
-Ordering by 'rank' gives us rank2, rank1, rank3. Ordering by the Meta.ordering
@@ -714 +716 @@
->>> ManagedModel.objects.update(data='mm')
-
+A values() or values_list() query across joined models must use outer joins
+appropriately.
+>>> Report.objects.values_list("creator__extra__info", flat=True).order_by("name")
+[u'e1', u'e2', None]
+
-"""}
-