Skip to content

Commit

Permalink
Refs #35339 -- Fixed source expressions in GeoAggregate on Oracle.
Browse files Browse the repository at this point in the history
Regression in 42b567a.
  • Loading branch information
felixxm committed Apr 27, 2024
1 parent 828b94b commit 8c257ce
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions django/contrib/gis/db/models/aggregates.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,14 @@ def as_oracle(self, compiler, connection, **extra_context):
tolerance = self.extra.get("tolerance") or getattr(self, "tolerance", 0.05)
clone = self.copy()
source_expressions = self.get_source_expressions()
if self.filter:
source_expressions.pop()
source_expressions.pop() # Don't wrap filters with SDOAGGRTYPE().
spatial_type_expr = Func(
*source_expressions,
Value(tolerance),
function="SDOAGGRTYPE",
output_field=self.output_field,
)
source_expressions = [spatial_type_expr]
if self.filter:
source_expressions.append(self.filter)
source_expressions = [spatial_type_expr, self.filter]
clone.set_source_expressions(source_expressions)
return clone.as_sql(compiler, connection, **extra_context)
return self.as_sql(compiler, connection, **extra_context)
Expand Down

0 comments on commit 8c257ce

Please sign in to comment.