summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/models/sql/query.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 2a5ee616d8..35dfbcb12f 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -130,7 +130,8 @@ class Query(object):
"""
if name in self.quote_cache:
return self.quote_cache[name]
- if name in self.alias_map and name not in self.table_map:
+ if ((name in self.alias_map and name not in self.table_map) or
+ name in self.extra_select):
self.quote_cache[name] = name
return name
r = self.connection.ops.quote_name(name)