summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorSergey Fedoseev <fedoseev.sergey@gmail.com>2017-03-29 22:29:53 +0500
committerTim Graham <timograham@gmail.com>2017-03-29 13:29:53 -0400
commit068d75688f28f9a1530b771ae1d625f41e98cd82 (patch)
treea1e4b40c4425de439990d8eaa38553fe8374280f /django
parentd5977e492e6e8eb7ba0ac81f85c27d56db85b78c (diff)
Refs #18247 -- Fixed SQLite QuerySet filtering on decimal result of Least and Greatest.
Diffstat (limited to 'django')
-rw-r--r--django/db/models/expressions.py4
-rw-r--r--django/db/models/functions/base.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
index ed57599a15..36f22838eb 100644
--- a/django/db/models/expressions.py
+++ b/django/db/models/expressions.py
@@ -575,8 +575,8 @@ class Func(Expression):
data['expressions'] = data['field'] = arg_joiner.join(sql_parts)
return template % data, params
- def as_sqlite(self, compiler, connection):
- sql, params = self.as_sql(compiler, connection)
+ def as_sqlite(self, compiler, connection, **extra_context):
+ sql, params = self.as_sql(compiler, connection, **extra_context)
try:
if self.output_field.get_internal_type() == 'DecimalField':
sql = 'CAST(%s AS NUMERIC)' % sql
diff --git a/django/db/models/functions/base.py b/django/db/models/functions/base.py
index 5bcbbb8f06..6d08c939e1 100644
--- a/django/db/models/functions/base.py
+++ b/django/db/models/functions/base.py
@@ -132,7 +132,7 @@ class Greatest(Func):
def as_sqlite(self, compiler, connection):
"""Use the MAX function on SQLite."""
- return super().as_sql(compiler, connection, function='MAX')
+ return super().as_sqlite(compiler, connection, function='MAX')
class Least(Func):
@@ -152,7 +152,7 @@ class Least(Func):
def as_sqlite(self, compiler, connection):
"""Use the MIN function on SQLite."""
- return super().as_sql(compiler, connection, function='MIN')
+ return super().as_sqlite(compiler, connection, function='MIN')
class Length(Transform):