diff options
| author | Anssi Kääriäinen <akaariai@gmail.com> | 2013-08-19 16:34:04 +0300 |
|---|---|---|
| committer | Anssi Kääriäinen <akaariai@gmail.com> | 2013-08-19 16:35:11 +0300 |
| commit | ddeb20e31b3fd362bf8a22a40e61171d66177100 (patch) | |
| tree | f28dd21cbac5c04899e1e9f1f58f2d57a0fc241c | |
| parent | 7b69c3e7758770dd632e1754c30714e91868e037 (diff) | |
Fixed GIS regression caused by force_subq
Caused by commit 7737305a4f5dc5006d92dac3a61523ad6c2a523a
| -rw-r--r-- | django/contrib/gis/db/models/sql/query.py | 4 |
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): """ |