From 4c3bfe9053766d378999d06ec34ee5fd4e39f511 Mon Sep 17 00:00:00 2001 From: Loic Bistuer Date: Fri, 30 Jan 2015 14:26:13 +0700 Subject: Fixed #24211 -- Removed ValuesQuerySet() and ValuesListQuerySet(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Anssi Kääriäinen, Marc Tamlyn, and Tim Graham for the reviews. --- django/db/models/sql/where.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'django/db/models/sql/where.py') diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index fe428b2418..3b894b8aed 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -204,7 +204,7 @@ class SubqueryConstraint(object): if query._db and connection.alias != query._db: raise ValueError("Can't do subqueries with queries on different DBs.") # Do not override already existing values. - if not hasattr(query, 'field_names'): + if query._fields is None: query = query.values(*self.targets) else: query = query._clone() -- cgit v1.3