test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Get the join promotion code (a bit more) correct when constructing joins for ordering. 

Yes, this really is a commit that fixes an oversight in a commit that fixed an
oversight. One day I'll get it right.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-09-02 00:20:10 +00:00
parent a47bffad17
commit 1b615ac46d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/sql/query.py
View File

@ -660,7 +660,8 @@ class Query(object):
# Must use left outer joins for nullable fields. # Must use left outer joins for nullable fields.
must_promote = False must_promote = False
for join in joins: for join in joins:
must_promote = self.promote_alias(join, must_promote) if self.promote_alias(join, must_promote):
must_promote = True
# If we get to this point and the field is a relation to another model, # If we get to this point and the field is a relation to another model,
# append the default ordering for that model. # append the default ordering for that model.