diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-08-11 18:22:40 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-08-11 09:22:40 -0400 |
| commit | f3e350d6318c20d0d5e2f53f278b9dcc326e1d74 (patch) | |
| tree | 35f8a9e427c14abb610bcf01d283391d2578ab95 | |
| parent | 7fa92daa9910ef2e1e204fa5a2500421eb8a2af5 (diff) | |
Replaced typecast_decimal() with decimal.Decimal().
| -rw-r--r-- | django/db/backends/sqlite3/base.py | 2 | ||||
| -rw-r--r-- | django/db/backends/utils.py | 6 | ||||
| -rw-r--r-- | django/db/models/expressions.py | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py index cac91df1ba..eabcdfabe5 100644 --- a/django/db/backends/sqlite3/base.py +++ b/django/db/backends/sqlite3/base.py @@ -39,7 +39,7 @@ Database.register_converter("date", decoder(parse_date)) Database.register_converter("datetime", decoder(parse_datetime)) Database.register_converter("timestamp", decoder(parse_datetime)) Database.register_converter("TIMESTAMP", decoder(parse_datetime)) -Database.register_converter("decimal", decoder(backend_utils.typecast_decimal)) +Database.register_converter("decimal", decoder(decimal.Decimal)) Database.register_adapter(decimal.Decimal, backend_utils.rev_typecast_decimal) diff --git a/django/db/backends/utils.py b/django/db/backends/utils.py index e5b2d5235f..8d3a8ab4b3 100644 --- a/django/db/backends/utils.py +++ b/django/db/backends/utils.py @@ -160,12 +160,6 @@ def typecast_timestamp(s): # does NOT store time zone information ) -def typecast_decimal(s): - if s is None: - return None - return decimal.Decimal(s) - - ############################################### # Converters from Python to database (string) # ############################################### diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 9a996f66b3..b9d03111c8 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -1,9 +1,9 @@ import copy import datetime from contextlib import suppress +from decimal import Decimal from django.core.exceptions import EmptyResultSet, FieldError -from django.db.backends import utils as backend_utils from django.db.models import fields from django.db.models.query_utils import Q from django.utils.deconstruct import deconstructible @@ -289,7 +289,7 @@ class BaseExpression: elif internal_type.endswith('IntegerField'): return int(value) elif internal_type == 'DecimalField': - return backend_utils.typecast_decimal(value) + return Decimal(value) return value def get_lookup(self, lookup): |
