Changeset 7761

Timestamp:

06/26/08 01:50:22 (5 months ago)

Author:

mtredinnick

Message:

Fixed #7181 -- when ordering by a potentially NULL field, use a left-outer join
so that the ordering doesn't accidentally restrict the result set.

(Ironically, one existing test actually showed this problem, but I was too
dumb to notice the result was incorrect.)

Files:

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

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

@@ -611 +611 @@
-        col = target.column
-
+        # Must use left outer joins for nullable fields.
+        for join in joins:
+            self.promote_alias(join)
+
-        # If we get to this point and the field is a relation to another model,
-        # append the default ordering for that model.

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

@@ -500 +500 @@
-# ForeignKey) is legal, but the results might not make sense. That isn't
-# Django's problem. Garbage in, garbage out.
-all(
+filter(tags__isnull=False
-[<Item: one>, <Item: two>, <Item: one>, <Item: two>, <Item: four>]
-
@@ -763 +763 @@
-[<Tag: t1>, <Tag: t4>, <Tag: t5>]
-
+Bug #7181 -- ordering by related tables should accomodate nullable fields (this
+test is a little tricky, since NULL ordering is database dependent. Instead, we
+just count the number of results).
+>>> len(Tag.objects.order_by('parent__name'))
+5
+
-"""}
-