p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed regressions from 36ded01527. 

Refs #21302
This commit is contained in:
Florian Apolloner 2013-11-03 12:45:15 +01:00
parent 539e3693d4
commit f40f90d63b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/gis/db/models/sql/aggregates.py
View File

@ -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 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): class GeoAggregate(Aggregate):

4
django/db/models/sql/aggregates.py
View File

@ -5,6 +5,10 @@ import copy
from django.db.models.fields import IntegerField, FloatField 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. # Fake fields used to identify aggregate types in data-conversion operations.
ordinal_aggregate_field = IntegerField() ordinal_aggregate_field = IntegerField()
computed_aggregate_field = FloatField() computed_aggregate_field = FloatField()