diff options
| author | Jacob Walls <jacobtylerwalls@gmail.com> | 2024-12-29 01:13:48 -0800 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-08-04 10:14:01 +0200 |
| commit | 8914f4703cf03e2a01683c4ba00f5ae7d3fa449d (patch) | |
| tree | 5331d4fac059c893d16875710dc8539ff91bdc81 /django/contrib/gis | |
| parent | 079d31e698fa08dd92e2bc4f3fe9b4817a214419 (diff) | |
Fixed #35972 -- Fixed lookup crashes after subquery annotations.
Diffstat (limited to 'django/contrib/gis')
| -rw-r--r-- | django/contrib/gis/db/models/lookups.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/django/contrib/gis/db/models/lookups.py b/django/contrib/gis/db/models/lookups.py index 3d30ffed5c..b9e5e47b27 100644 --- a/django/contrib/gis/db/models/lookups.py +++ b/django/contrib/gis/db/models/lookups.py @@ -55,7 +55,7 @@ class GISLookup(Lookup): def get_db_prep_lookup(self, value, connection): # get_db_prep_lookup is called by process_rhs from super class - return ("%s", [connection.ops.Adapter(value)]) + return ("%s", (connection.ops.Adapter(value),)) def process_rhs(self, compiler, connection): if isinstance(self.rhs, Query): @@ -284,7 +284,7 @@ class RelateLookup(GISLookup): elif not isinstance(pattern, str) or not self.pattern_regex.match(pattern): raise ValueError('Invalid intersection matrix pattern "%s".' % pattern) sql, params = super().process_rhs(compiler, connection) - return sql, [*params, pattern] + return sql, (*params, pattern) @BaseSpatialField.register_lookup @@ -352,7 +352,7 @@ class DWithinLookup(DistanceLookupBase): dist_sql, dist_params = self.process_distance(compiler, connection) self.template_params["value"] = dist_sql rhs_sql, params = super().process_rhs(compiler, connection) - return rhs_sql, params + dist_params + return rhs_sql, (*params, *dist_params) class DistanceLookupFromFunction(DistanceLookupBase): @@ -367,7 +367,7 @@ class DistanceLookupFromFunction(DistanceLookupBase): dist_sql, dist_params = self.process_distance(compiler, connection) return ( "%(func)s %(op)s %(dist)s" % {"func": sql, "op": self.op, "dist": dist_sql}, - params + dist_params, + (*params, *dist_params), ) |
