From 07bfc76ecf22bfcd0cdbabe6af8639db2a0253dd Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Sun, 15 May 2011 00:56:01 +0000 Subject: Fixed #15790 -- Fixed QuerySet only() and defer() methods behavior with proxy models. Thanks Michal Modzelewzki for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16228 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'django/db/models/sql/query.py') 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 -- cgit v1.3