From 873858009c931d6e7bf979800cc0d16b5a71f24e Mon Sep 17 00:00:00 2001 From: Sergey Fedoseev Date: Sat, 16 Sep 2017 14:24:59 +0500 Subject: [PATCH] Simplified Count.convert_value() and RegrCount.convert_value(). --- django/contrib/postgres/aggregates/statistics.py | 4 +--- django/db/models/aggregates.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/django/contrib/postgres/aggregates/statistics.py b/django/contrib/postgres/aggregates/statistics.py index 5f5ddc4757..db6c8e6dc5 100644 --- a/django/contrib/postgres/aggregates/statistics.py +++ b/django/contrib/postgres/aggregates/statistics.py @@ -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): diff --git a/django/db/models/aggregates.py b/django/db/models/aggregates.py index b70ea03838..365a885b53 100644 --- a/django/db/models/aggregates.py +++ b/django/db/models/aggregates.py @@ -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):