Fixed #26434 -- Removed faulty clearing of ordering field when missing from explicit grouping.

Co-authored-by: Simon Charette <charette.s@gmail.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 84950d4ec0..8f9349e7eb 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -2346,7 +2346,13 @@ 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
+            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)
+            )
         ):
             return
         self.order_by = ()