summaryrefslogtreecommitdiff
path: root/django/db/models
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-04-30 14:07:47 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-04-30 14:07:47 +0000
commit4e97d7f8e4acddb2b33d0a1e8bca721ae63d7d7c (patch)
tree18859ad6b02ba2d3ee2a09fac1a8d0e5c6b339bd /django/db/models
parent1ff7ed2e69081eacaa6e160f99beabe35853cb02 (diff)
Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models')
-rw-r--r--django/db/models/sql/query.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index cfe5d37a37..40faa545c8 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -556,7 +556,7 @@ class Query(object):
# models.
workset = {}
for model, values in seen.iteritems():
- for field in model._meta.local_fields:
+ for field in model._meta.fields:
if field in values:
continue
add_to_dict(workset, model, field)