From 2d7feda05c45f38a04a6ee7ec93842cfea7aff43 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 1 Sep 2008 02:43:55 +0000 Subject: Fixed #7512 -- Fixed an oversight when I first fixed ordering on nullable foreign keys (r7761). Thanks to George Vilches for the test case here. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8783 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 166e818e56..2e3169a3c0 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -658,8 +658,9 @@ class Query(object): self.ref_alias(alias) # Must use left outer joins for nullable fields. + must_promote = False for join in joins: - self.promote_alias(join) + must_promote = self.promote_alias(join, must_promote) # If we get to this point and the field is a relation to another model, # append the default ordering for that model. -- cgit v1.3