Context Navigation

Ticket #18333: django-ticket18333.2.diff

File django-ticket18333.2.diff, 951 bytes (added by Michael Manfre, 13 years ago)

diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py
index b41314a..f9d810a 100644

                class Aggregate(object):
         elif isinstance(self.col, (list, tuple)):
             field_name = '.'.join([qn(c) for c in self.col])
         else:
             field_name = self.col
+            field_name = qn(self.col)
         params = {
             'function': self.sql_function,

diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 3cd26d3..54e004f 100644

                class SQLCompiler(object):
         self.query = query
         self.connection = connection
         self.using = using
         self.quote_cache = {}
+        self.quote_cache = {'*': '*'}
     def pre_sql_setup(self):
         """