diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-30 16:32:48 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-30 16:32:48 +0000 |
| commit | 8b1aebbf352cd2c7e0c3bd81b83553fe293ad56a (patch) | |
| tree | 733d0ad2f5424482b68d40ebeaa9673621f1d452 /django/db/models/sql/query.py | |
| parent | 21d98c5ebdf7063aca8666255b31673e6af595c8 (diff) | |
Fixed #12851 -- Another attempt at fixing select_related() with inherited models, this time with only(). Thanks to phxx for the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 40faa545c8..0913399e2a 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -556,10 +556,10 @@ class Query(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 |