mirror of
https://github.com/django/django.git
synced 2025-04-01 12:06:43 +00:00
Fixed regressions from 36ded01527b690b5df0574492af9cfcc2ea3d1dc.
Refs #21302
This commit is contained in:
parent
539e3693d4
commit
f40f90d63b
@ -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):
|
||||
|
@ -5,6 +5,10 @@ import copy
|
||||
|
||||
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()
|
||||
|
Loading…
x
Reference in New Issue
Block a user