diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-30 14:12:12 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-30 14:12:12 +0000 |
| commit | 2eb832a7e65b1c24904c140fa024169524d101f8 (patch) | |
| tree | ae73cc9d9c356448dfb97fa1cc8f3fa1a9ae2e12 /django/db/models/sql/query.py | |
| parent | 6f4563acede94a339cd64235cce95ba224be259d (diff) | |
[1.1.X] Fixed #12851 -- Corrected the loading of values when select_related() is used on inherited models. Thanks to phxx for the report and test case.
Backport of r13054 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 4c473b6b7e..b677169f39 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -621,7 +621,7 @@ class BaseQuery(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) |