From 4dc766c9e1912dd0858c8ef80197fe2a3bb1ec92 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 19 Dec 2007 13:06:16 +0000 Subject: [PATCH] queryset-refactor: Tweaked quote_name_if_not_alias() slightly. git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6960 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)