mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-27 23:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed #12937 -- Corrected the operation of select_related() when following an reverse relation on an inherited model. Thanks to subsume for the report.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-03-20 15:02:59 +00:00
parent 4528f39886
commit bfa080f402
4 changed files with 41 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,7 +215,7 @@ class SQLCompiler(object):
return result
def get_default_columns(self, with_aliases=False, col_aliases=None,
start_alias=None, opts=None, as_pairs=False):
start_alias=None, opts=None, as_pairs=False, local_only=False):
"""
Computes the default columns for selecting every field in the base
model. Will sometimes be called to pull in related models (e.g. via
@ -240,6 +240,8 @@ class SQLCompiler(object):
if start_alias:
seen = {None: start_alias}
for field, model in opts.get_fields_with_model():
if local_only and model is not None:
continue
if start_alias:
try:
alias = seen[model]
@ -643,7 +645,7 @@ class SQLCompiler(object):
)
used.add(alias)
columns, aliases = self.get_default_columns(start_alias=alias,
opts=model._meta, as_pairs=True)
opts=model._meta, as_pairs=True, local_only=True)
self.query.related_select_cols.extend(columns)
self.query.related_select_fields.extend(model._meta.fields)