mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-27 12:39:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case.

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-04-30 16:32:48 +00:00
parent 21d98c5ebd
commit 8b1aebbf35
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
django/db/models/query.py
View file

@ -1154,7 +1154,17 @@ def get_cached_row(klass, row, index_start, using, max_depth=0, cur_depth=0,
return None
restricted = requested is not None
load_fields = only_load and only_load.get(klass) or None
if only_load:
load_fields = only_load.get(klass)
# When we create the object, we will also be creating populating
# all the parent classes, so traverse the parent classes looking
# for fields that must be included on load.
for parent in klass._meta.get_parent_list():
fields = only_load.get(parent)
if fields:
load_fields.update(fields)
else:
load_fields = None
if load_fields:
# Handle deferred fields.
skip = set()