[pull] main from django:main

AUTHORS

@@ -1066,6 +1066,7 @@ answer newbie questions, and generally made Django that much better:
     Unai Zalakain <unai@gisa-elkartea.org>
     Valentina Mukhamedzhanova <umirra@gmail.com>
     valtron
+    Varun Kasyap Pentamaraju <varunkasyap@hotmail.com>
     Vasiliy Stavenko <stavenko@gmail.com>
     Vasil Vangelovski
     Vibhu Agarwal <vibhu-agarwal.github.io>

django/db/models/sql/query.py

@@ -2346,7 +2346,13 @@ def clear_ordering(self, force=False, clear_default=True):
         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 = ()

docs/topics/i18n/translation.txt

@@ -715,7 +715,7 @@ An example:
 .. code-block:: html+django
 
     {% blocktranslate count counter=list|length %}
-    There is only one {{ name }} object.
+    There is {{ counter }} {{ name }} object.
     {% plural %}
     There are {{ counter }} {{ name }} objects.
     {% endblocktranslate %}

tests/aggregation_regress/tests.py

@@ -171,6 +171,25 @@ def assertObjectAttrs(self, obj, **kwargs):
         for attr, value in kwargs.items():
             self.assertEqual(getattr(obj, attr), value)
 
+    def test_count_preserve_group_by(self):
+        # new release of the same book
+        Book.objects.create(
+            isbn="113235613",
+            name=self.b4.name,
+            pages=self.b4.pages,
+            rating=4.0,
+            price=Decimal("39.69"),
+            contact=self.a5,
+            publisher=self.p3,
+            pubdate=datetime.date(2018, 11, 3),
+        )
+        qs = Book.objects.values("contact__name", "publisher__name").annotate(
+            publications=Count("id")
+        )
+        self.assertEqual(qs.count(), Book.objects.count() - 1)
+        self.assertEqual(qs.order_by("id").count(), Book.objects.count())
+        self.assertEqual(qs.extra(order_by=["id"]).count(), Book.objects.count())
+
     def test_annotation_with_value(self):
         values = (
             Book.objects.filter(