diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2017-03-29 22:29:53 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-03-30 08:47:16 -0400 |
| commit | 8484cf4cd0a6d3553f6fc1d62fa6dc04f04624f0 (patch) | |
| tree | 54718e153fcaee37e2553fe1ae303a732fb44589 /django | |
| parent | d476fa96ac1a91b5dbb9cf735665bb8755d1ee2a (diff) | |
[1.11.x] Refs #18247 -- Fixed SQLite QuerySet filtering on decimal result of Least and Greatest.
Backport of 068d75688f28f9a1530b771ae1d625f41e98cd82 from master
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/expressions.py | 4 | ||||
| -rw-r--r-- | django/db/models/functions/base.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index a05a1b35ab..b1d67e6653 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -570,8 +570,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 ca73340b85..8adba2743c 100644 --- a/django/db/models/functions/base.py +++ b/django/db/models/functions/base.py @@ -137,7 +137,7 @@ class Greatest(Func): def as_sqlite(self, compiler, connection): """Use the MAX function on SQLite.""" - return super(Greatest, self).as_sql(compiler, connection, function='MAX') + return super(Greatest, self).as_sqlite(compiler, connection, function='MAX') class Least(Func): @@ -157,7 +157,7 @@ class Least(Func): def as_sqlite(self, compiler, connection): """Use the MIN function on SQLite.""" - return super(Least, self).as_sql(compiler, connection, function='MIN') + return super(Least, self).as_sqlite(compiler, connection, function='MIN') class Length(Transform): |