Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed regressions from 36ded01.

Refs #21302
  • Loading branch information...
commit f40f90d63b4be295269b5f0de5f919be22daba5c 1 parent 539e369
@apollo13 apollo13 authored
View
5 django/contrib/gis/db/models/sql/aggregates.py
@@ -1,8 +1,9 @@
-from django.db.models.sql.aggregates import Aggregate, Count
+from django.db.models.sql import aggregates
+from django.db.models.sql.aggregates import * # NOQA
from django.contrib.gis.db.models.fields import GeometryField
-__all__ = ['Count', 'Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union']
+__all__ = ['Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union'] + aggregates.__all__
class GeoAggregate(Aggregate):
View
4 django/db/models/sql/aggregates.py
@@ -5,6 +5,10 @@
from django.db.models.fields import IntegerField, FloatField
+
+__all__ = ['Aggregate', 'Avg', 'Count', 'Max', 'Min', 'StdDev', 'Sum', 'Variance']
+
+
# Fake fields used to identify aggregate types in data-conversion operations.
ordinal_aggregate_field = IntegerField()
computed_aggregate_field = FloatField()
Please sign in to comment.
Something went wrong with that request. Please try again.