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

Simplified Count.convert_value() and RegrCount.convert_value().

This commit is contained in:
Sergey Fedoseev 2017-09-16 14:24:59 +05:00
parent 86a18dc46a
commit 873858009c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/postgres/aggregates/statistics.py
View File

@ -42,9 +42,7 @@ class RegrCount(StatAggregate):
output_field = IntegerField()
def convert_value(self, value, expression, connection):
if value is None:
return 0
return int(value)
return 0 if value is None else value
class RegrIntercept(StatAggregate):

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

@ -125,9 +125,7 @@ class Count(Aggregate):
return dict(options, distinct=self.extra['distinct'] != '')
def convert_value(self, value, expression, connection):
if value is None:
return 0
return int(value)
return 0 if value is None else value
class Max(Aggregate):