From 1a922870ea07e730281c0e2a7b3a170232a81236 Mon Sep 17 00:00:00 2001 From: Anssi Kääriäinen Date: Tue, 24 Sep 2013 18:42:40 +0300 Subject: [1.6.x] Fixed #21150 -- Improved Query.add_fields() join promotion logic Thanks to Eivind Fonn for the report and test case. --- django/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 510b21b64b..45276640e0 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1525,7 +1525,7 @@ class Query(object): for name in field_names: field, targets, u2, joins, path = self.setup_joins( name.split(LOOKUP_SEP), opts, alias, None, allow_m2m, - True) + allow_explicit_fk=True, outer_if_first=True) # Trim last join if possible targets, final_alias, remaining_joins = self.trim_joins(targets, joins[-2:], path) -- cgit v1.3