summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 9a5666b143..27c6859c61 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -553,7 +553,10 @@ class Query(object):
columns = set()
orig_opts = self.model._meta
seen = {}
- must_include = {self.model: set([orig_opts.pk])}
+ if orig_opts.proxy:
+ must_include = {orig_opts.proxy_for_model: set([orig_opts.pk])}
+ else:
+ must_include = {self.model: set([orig_opts.pk])}
for field_name in field_names:
parts = field_name.split(LOOKUP_SEP)
cur_model = self.model