mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-02 16:16:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Made sure join_field is always available in .join()

Browse source 
Refs #19385
This commit is contained in:
Anssi Kääriäinen 2012-12-17 00:43:33 +02:00
parent a04df803a5
commit 9ef3cab40b
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
django/db/models/sql/query.py
View file

@ -944,6 +944,7 @@ class Query(object):
The 'join_field' is the field we are joining along (if any).
"""
lhs, table, lhs_col, col = connection
assert lhs is None or join_field is not None
existing = self.join_map.get(connection, ())
if reuse is None:
reuse = existing
@ -1003,8 +1004,9 @@ class Query(object):
for field, model in opts.get_fields_with_model():
if model not in seen:
link_field = opts.get_ancestor_link(model)
seen[model] = self.join((root_alias, model._meta.db_table,
link_field.column, model._meta.pk.column))
seen[model] = self.join(
(root_alias, model._meta.db_table, link_field.column,
model._meta.pk.column), join_field=link_field)
self.included_inherited_models = seen
def remove_inherited_models(self):