diff options
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 4 | ||||
| -rw-r--r-- | django/db/models/sql/query.py | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index a07e506fc7..84c28a0d35 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -14,10 +14,6 @@ class SQLCompiler(object): self.using = using self.quote_cache = {} - # Check that the compiler will be able to execute the query - for alias, aggregate in self.query.aggregate_select.items(): - self.connection.ops.check_aggregate_support(aggregate) - def pre_sql_setup(self): """ Does any necessary class setup immediately prior to producing SQL. This diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 9819be09a1..72d4bc9c1b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -189,6 +189,11 @@ class Query(object): raise ValueError("Need either using or connection") if using: connection = connections[using] + + # Check that the compiler will be able to execute the query + for alias, aggregate in self.aggregate_select.items(): + connection.ops.check_aggregate_support(aggregate) + return connection.ops.compiler(self.compiler)(self, connection, using) def get_meta(self): |