summaryrefslogtreecommitdiff
path: root/django/contrib/gis/db/models/sql/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib/gis/db/models/sql/query.py')
-rw-r--r--django/contrib/gis/db/models/sql/query.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py
index 5877f2975a..93a7642bbb 100644
--- a/django/contrib/gis/db/models/sql/query.py
+++ b/django/contrib/gis/db/models/sql/query.py
@@ -76,7 +76,7 @@ class GeoQuery(sql.Query):
return super(GeoQuery, self).convert_values(value, field, connection)
return value
- def get_aggregation(self, using):
+ def get_aggregation(self, using, force_subq=False):
# Remove any aggregates marked for reduction from the subquery
# and move them to the outer AggregateQuery.
connection = connections[using]
@@ -84,7 +84,7 @@ class GeoQuery(sql.Query):
if isinstance(aggregate, gis_aggregates.GeoAggregate):
if not getattr(aggregate, 'is_extent', False) or connection.ops.oracle:
self.extra_select_fields[alias] = GeomField()
- return super(GeoQuery, self).get_aggregation(using)
+ return super(GeoQuery, self).get_aggregation(using, force_subq)
def resolve_aggregate(self, value, aggregate, connection):
"""