diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/query.py | 12 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py index 5c81b8d5fd..36bf6398ba 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -970,7 +970,17 @@ def get_cached_row(klass, row, index_start, 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() diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index b677169f39..fa339262eb 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -621,10 +621,10 @@ class BaseQuery(object): # models. workset = {} for model, values in seen.iteritems(): - for field in model._meta.fields: + for field, m in model._meta.get_fields_with_model(): if field in values: continue - add_to_dict(workset, model, field) + add_to_dict(workset, m or model, field) for model, values in must_include.iteritems(): # If we haven't included a model in workset, we don't add the # corresponding must_include fields for that model, since an |