diff options
| author | Simon Charette <charette.s@gmail.com> | 2020-02-27 00:34:37 -0500 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-02-27 09:20:30 +0100 |
| commit | 16cacdcb3f7856df5454b648503374de150fa245 (patch) | |
| tree | bea0824e3d16f8935ecf3a7bb799f189a875ee76 /django/db | |
| parent | 59ac25c93b228cd4ef34d4f36fbfbab3d9f6b4ad (diff) | |
[3.0.x] Fixed #31312 -- Properly ordered temporal subtraction params on MySQL.
Regression in 9bcbcd599abac91ea853b2fe10b784ba32df043e.
Thanks rick2ricks for the report.
Backport of 41ebe60728a15aa273f4d70de92f5246a89c3d4e from master
Diffstat (limited to 'django/db')
| -rw-r--r-- | django/db/backends/mysql/operations.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 241e6e2135..b3225fafa0 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -287,7 +287,7 @@ class DatabaseOperations(BaseDatabaseOperations): "((TIME_TO_SEC(%(lhs)s) * 1000000 + MICROSECOND(%(lhs)s)) -" " (TIME_TO_SEC(%(rhs)s) * 1000000 + MICROSECOND(%(rhs)s)))" ) % {'lhs': lhs_sql, 'rhs': rhs_sql}, tuple(lhs_params) * 2 + tuple(rhs_params) * 2 - params = (*lhs_params, *rhs_params) + params = (*rhs_params, *lhs_params) return "TIMESTAMPDIFF(MICROSECOND, %s, %s)" % (rhs_sql, lhs_sql), params def explain_query_prefix(self, format=None, **options): |