summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2017-08-31 08:59:45 +0800
committerTim Graham <timograham@gmail.com>2017-08-31 09:35:05 -0400
commit84b7cb7df00192b2f804e2c6fd98b78b5bfd1ffa (patch)
tree8ce9b667e5bf0b462a3d933b1e7afb866dd3b8a5 /django
parente5bd585c6eb1e13e2f8aac030b33c077b0b70c05 (diff)
Fixed #28549 -- Fixed QuerySet.defer() with super and subclass fields.
Previously, deferring fields in different classes didn't omit the superclass' deferred field. Thanks Simon Charette for the suggested fix.
Diffstat (limited to 'django')
-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 9492e5bd58..0473654fe1 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -649,7 +649,7 @@ class Query:
# models.
workset = {}
for model, values in seen.items():
- for field in model._meta.fields:
+ for field in model._meta.local_fields:
if field in values:
continue
m = field.model._meta.concrete_model