diff options
| author | George Marshall <george@georgemarshall.name> | 2019-11-10 00:48:36 -0800 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-11-13 08:27:26 +0100 |
| commit | 8be79984dce7d819879a6e594ca69c5f95a08378 (patch) | |
| tree | f4164d6313d163605c66a64ddf4ba8f89a954ac3 /django/db/models/sql/query.py | |
| parent | b93a0e34d9b9b99d41103782b7e7aeabf47517e3 (diff) | |
Fixed #30971 -- Prevented Query.resolve_lookup_value() from coercing list values to tuples.
Regression in 8a281aa7fe76a9da2284f943964a9413697cff1f.
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index ea51912e8b..dd5889625f 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1059,21 +1059,10 @@ class Query(BaseExpression): elif isinstance(value, (list, tuple)): # The items of the iterable may be expressions and therefore need # to be resolved independently. - resolved_values = [] - for sub_value in value: - if hasattr(sub_value, 'resolve_expression'): - if isinstance(sub_value, F): - resolved_values.append(sub_value.resolve_expression( - self, reuse=can_reuse, allow_joins=allow_joins, - simple_col=simple_col, - )) - else: - resolved_values.append(sub_value.resolve_expression( - self, reuse=can_reuse, allow_joins=allow_joins, - )) - else: - resolved_values.append(sub_value) - value = tuple(resolved_values) + return type(value)( + self.resolve_lookup_value(sub_value, can_reuse, allow_joins, simple_col) + for sub_value in value + ) return value def solve_lookup_type(self, lookup): |
