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/postgresql/operations.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'django/db/backends/postgresql') 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): -- cgit v1.3