From 9bcbcd599abac91ea853b2fe10b784ba32df043e Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Thu, 2 Jan 2020 11:33:01 -0500 Subject: Fixed #31133 -- Fixed crash when subtracting against a subquery annotation. The subtract_temporals() database operation was not handling expressions returning SQL params in mixed database types. Regression in 35431298226165986ad07e91f9d3aca721ff38ec. Thanks Reupen Shah for the report. --- django/db/backends/base/operations.py | 2 +- django/db/backends/mysql/operations.py | 8 ++++---- django/db/backends/oracle/operations.py | 3 ++- django/db/backends/postgresql/operations.py | 3 ++- django/db/backends/sqlite3/operations.py | 5 +++-- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'django') diff --git a/django/db/backends/base/operations.py b/django/db/backends/base/operations.py index d9d59b4109..43220a18bc 100644 --- a/django/db/backends/base/operations.py +++ b/django/db/backends/base/operations.py @@ -626,7 +626,7 @@ class BaseDatabaseOperations: if self.connection.features.supports_temporal_subtraction: lhs_sql, lhs_params = lhs rhs_sql, rhs_params = rhs - return "(%s - %s)" % (lhs_sql, rhs_sql), lhs_params + rhs_params + return '(%s - %s)' % (lhs_sql, rhs_sql), (*lhs_params, *rhs_params) raise NotSupportedError("This backend does not support %s subtraction." % internal_type) def window_frame_start(self, start): diff --git a/django/db/backends/mysql/operations.py b/django/db/backends/mysql/operations.py index 5069939689..5342957767 100644 --- a/django/db/backends/mysql/operations.py +++ b/django/db/backends/mysql/operations.py @@ -286,13 +286,13 @@ class DatabaseOperations(BaseDatabaseOperations): # a decimal. MySQL returns an integer without microseconds. return 'CAST((TIME_TO_SEC(%(lhs)s) - TIME_TO_SEC(%(rhs)s)) * 1000000 AS SIGNED)' % { 'lhs': lhs_sql, 'rhs': rhs_sql - }, lhs_params + rhs_params + }, (*lhs_params, *rhs_params) return ( "((TIME_TO_SEC(%(lhs)s) * 1000000 + MICROSECOND(%(lhs)s)) -" " (TIME_TO_SEC(%(rhs)s) * 1000000 + MICROSECOND(%(rhs)s)))" - ) % {'lhs': lhs_sql, 'rhs': rhs_sql}, lhs_params * 2 + rhs_params * 2 - else: - return "TIMESTAMPDIFF(MICROSECOND, %s, %s)" % (rhs_sql, lhs_sql), rhs_params + lhs_params + ) % {'lhs': lhs_sql, 'rhs': rhs_sql}, tuple(lhs_params) * 2 + tuple(rhs_params) * 2 + params = (*lhs_params, *rhs_params) + return "TIMESTAMPDIFF(MICROSECOND, %s, %s)" % (rhs_sql, lhs_sql), params def explain_query_prefix(self, format=None, **options): # Alias MySQL's TRADITIONAL to TEXT for consistency with other backends. diff --git a/django/db/backends/oracle/operations.py b/django/db/backends/oracle/operations.py index 493854ce04..358c91505f 100644 --- a/django/db/backends/oracle/operations.py +++ b/django/db/backends/oracle/operations.py @@ -619,7 +619,8 @@ END; if internal_type == 'DateField': lhs_sql, lhs_params = lhs rhs_sql, rhs_params = rhs - return "NUMTODSINTERVAL(TO_NUMBER(%s - %s), 'DAY')" % (lhs_sql, rhs_sql), lhs_params + rhs_params + params = (*lhs_params, *rhs_params) + return "NUMTODSINTERVAL(TO_NUMBER(%s - %s), 'DAY')" % (lhs_sql, rhs_sql), params return super().subtract_temporals(internal_type, lhs, rhs) def bulk_batch_size(self, fields, objs): diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index 56e1331f75..ee7787c560 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -271,7 +271,8 @@ class DatabaseOperations(BaseDatabaseOperations): if internal_type == 'DateField': lhs_sql, lhs_params = lhs rhs_sql, rhs_params = rhs - return "(interval '1 day' * (%s - %s))" % (lhs_sql, rhs_sql), lhs_params + rhs_params + params = (*lhs_params, *rhs_params) + return "(interval '1 day' * (%s - %s))" % (lhs_sql, rhs_sql), params return super().subtract_temporals(internal_type, lhs, rhs) def window_frame_range_start_end(self, start=None, end=None): diff --git a/django/db/backends/sqlite3/operations.py b/django/db/backends/sqlite3/operations.py index ce8fe7209f..951aca0938 100644 --- a/django/db/backends/sqlite3/operations.py +++ b/django/db/backends/sqlite3/operations.py @@ -326,9 +326,10 @@ class DatabaseOperations(BaseDatabaseOperations): def subtract_temporals(self, internal_type, lhs, rhs): lhs_sql, lhs_params = lhs rhs_sql, rhs_params = rhs + params = (*lhs_params, *rhs_params) if internal_type == 'TimeField': - return "django_time_diff(%s, %s)" % (lhs_sql, rhs_sql), lhs_params + rhs_params - return "django_timestamp_diff(%s, %s)" % (lhs_sql, rhs_sql), lhs_params + rhs_params + return 'django_time_diff(%s, %s)' % (lhs_sql, rhs_sql), params + return 'django_timestamp_diff(%s, %s)' % (lhs_sql, rhs_sql), params def insert_statement(self, ignore_conflicts=False): return 'INSERT OR IGNORE INTO' if ignore_conflicts else super().insert_statement(ignore_conflicts) -- cgit v1.3