From 43933a1dca07047e95ec990d9289d0212668009e Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Tue, 28 Oct 2025 10:43:54 -0400 Subject: Reverted "Fixed #26434 -- Removed faulty clearing of ordering field when missing from explicit grouping." This reverts commit ea3a71c2d09f8281d8a50ed20e40e1fb13db5cd9. The implementation was flawed, as self.group_by contains Cols, not aliases. --- django/db/models/sql/query.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 8f9349e7eb..84950d4ec0 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -2346,13 +2346,7 @@ class Query(BaseExpression): query (not even the model's default). """ if not force and ( - self.is_sliced - or self.distinct_fields - or self.select_for_update - or ( - isinstance(self.group_by, tuple) - and not {*self.order_by, *self.extra_order_by}.issubset(self.group_by) - ) + self.is_sliced or self.distinct_fields or self.select_for_update ): return self.order_by = () -- cgit v1.3