diff options
Diffstat (limited to 'django/db/backends/sqlite3/operations.py')
| -rw-r--r-- | django/db/backends/sqlite3/operations.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index e90cc052d0..a267d75ea4 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -1,12 +1,12 @@ import datetime import uuid +from decimal import Decimal from django.conf import settings from django.core.exceptions import FieldError from django.db import utils from django.db.backends.base.operations import BaseDatabaseOperations from django.db.models import aggregates, fields -from django.db.models.expressions import Col from django.utils import timezone from django.utils.dateparse import parse_date, parse_datetime, parse_time from django.utils.duration import duration_string @@ -208,9 +208,7 @@ class DatabaseOperations(BaseDatabaseOperations): converters.append(self.convert_datefield_value) elif internal_type == 'TimeField': converters.append(self.convert_timefield_value) - # Converter for Col is added with Database.register_converter() - # in base.py. - elif internal_type == 'DecimalField' and not isinstance(expression, Col): + elif internal_type == 'DecimalField': converters.append(self.convert_decimalfield_value) elif internal_type == 'UUIDField': converters.append(self.convert_uuidfield_value) @@ -241,8 +239,7 @@ class DatabaseOperations(BaseDatabaseOperations): def convert_decimalfield_value(self, value, expression, connection): if value is not None: value = expression.output_field.format_number(value) - # Value is not converted to Decimal here as it will be converted - # later in BaseExpression.convert_value(). + value = Decimal(value) return value def convert_uuidfield_value(self, value, expression, connection): |