summaryrefslogtreecommitdiff
path: root/django/db/models/sql/compiler.py
diff options
context:
space:
mode:
authorMatthew Wilkes <git@matthewwilkes.name>2017-08-01 15:37:02 +0100
committerTim Graham <timograham@gmail.com>2017-08-01 14:25:54 -0400
commit32d1bf2bdbf9006bad8bdd94ff74333da84cae9c (patch)
tree8c9175ac95f42262bbf28126a17736807e0eacf4 /django/db/models/sql/compiler.py
parent8df7681d0e3b39cda9393c8e59f13b5681cc2f2f (diff)
Fixed #28454 -- Simplifed use of Query.setup_joins() by returning a named tuple.
Diffstat (limited to 'django/db/models/sql/compiler.py')
-rw-r--r--django/db/models/sql/compiler.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 2abfd2c289..5ae5213b14 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -818,8 +818,8 @@ class SQLCompiler:
related_field_name = f.related_query_name()
fields_found.add(related_field_name)
- _, _, _, joins, _ = self.query.setup_joins([related_field_name], opts, root_alias)
- alias = joins[-1]
+ join_info = self.query.setup_joins([related_field_name], opts, root_alias)
+ alias = join_info.joins[-1]
from_parent = issubclass(model, opts.model) and model is not opts.model
klass_info = {
'model': model,