Author: mtredinnick
Date: 2008-09-01 19:20:10 -0500 (Mon, 01 Sep 2008)
New Revision: 8829
Modified:
django/trunk/django/db/models/sql/query.py
Log:
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.
Modified: django/trunk/django/db/models/sql/query.py
===================================================================
--- django/trunk/django/db/models/sql/query.py 2008-09-01 23:57:55 UTC (rev
8828)
+++ django/trunk/django/db/models/sql/query.py 2008-09-02 00:20:10 UTC (rev
8829)
@@ -660,7 +660,8 @@
# Must use left outer joins for nullable fields.
must_promote = False
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,
# append the default ordering for that model.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
