diff options
Diffstat (limited to 'django/db/models/sql/aggregates.py')
| -rw-r--r-- | django/db/models/sql/aggregates.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py index 6fdaf188c4..8a14bdf2df 100644 --- a/django/db/models/sql/aggregates.py +++ b/django/db/models/sql/aggregates.py @@ -72,15 +72,13 @@ class Aggregate(object): if isinstance(self.col, (list, tuple)): self.col = (change_map.get(self.col[0], self.col[0]), self.col[1]) - def as_sql(self, quote_func=None): + def as_sql(self, qn, connection): "Return the aggregate, rendered as SQL." - if not quote_func: - quote_func = lambda x: x if hasattr(self.col, 'as_sql'): - field_name = self.col.as_sql(quote_func) + field_name = self.col.as_sql(qn, connection) elif isinstance(self.col, (list, tuple)): - field_name = '.'.join([quote_func(c) for c in self.col]) + field_name = '.'.join([qn(c) for c in self.col]) else: field_name = self.col @@ -127,4 +125,3 @@ class Variance(Aggregate): def __init__(self, col, sample=False, **extra): super(Variance, self).__init__(col, **extra) self.sql_function = sample and 'VAR_SAMP' or 'VAR_POP' - |