summaryrefslogtreecommitdiff
path: root/django/db/models/sql/query.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/sql/query.py')
-rw-r--r--django/db/models/sql/query.py8
1 files changed, 1 insertions, 7 deletions
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 = ()