Commit ddeb20e3 authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

Fixed GIS regression caused by force_subq 

Caused by commit 7737305a
parent 7b69c3e7

django/contrib/gis/db/models/sql/query.py

+2 −2
Original line number Diff line number Diff line
@@ -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):

        """