diff options
| author | Simon Charette <charette.s@gmail.com> | 2025-07-24 15:18:47 -0400 |
|---|---|---|
| committer | Natalia <124304+nessita@users.noreply.github.com> | 2025-07-28 16:40:08 -0300 |
| commit | 3031c512f0cf030dc8f99128bcb4fb9d4d6e285a (patch) | |
| tree | 8692964a018a71f0346737866f43e854075b63dd /django/db/models/fields/tuple_lookups.py | |
| parent | 28f33f50b2edb6a40bb2696af0eed2b9d76494cd (diff) | |
[5.2.x] Fixed #36522 -- Added support for filtering composite pks using a tuple of expressions.
Thanks Jacob Walls for the report, and Sarah Boyce and Mariusz Felisiak
for reviews.
Backport of 0a4999b422702c64e21f5a10a4d60300b7074401 from main.
Diffstat (limited to 'django/db/models/fields/tuple_lookups.py')
| -rw-r--r-- | django/db/models/fields/tuple_lookups.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/django/db/models/fields/tuple_lookups.py b/django/db/models/fields/tuple_lookups.py index 2af2e193d5..3b9ff85dff 100644 --- a/django/db/models/fields/tuple_lookups.py +++ b/django/db/models/fields/tuple_lookups.py @@ -92,7 +92,11 @@ class TupleLookupMixin: def process_rhs(self, compiler, connection): if self.rhs_is_direct_value(): args = [ - Value(val, output_field=col.output_field) + ( + val + if hasattr(val, "as_sql") + else Value(val, output_field=col.output_field) + ) for col, val in zip(self.lhs, self.rhs) ] return compiler.compile(Tuple(*args)) @@ -326,7 +330,11 @@ class TupleIn(TupleLookupMixin, In): result.append( Tuple( *[ - Value(val, output_field=col.output_field) + ( + val + if hasattr(val, "as_sql") + else Value(val, output_field=col.output_field) + ) for col, val in zip(lhs, vals) ] ) |