aggregation_regress edits

Author: timgraham

tests/aggregation_regress/models.py

@@ -19,7 +19,7 @@ class Publisher(models.Model):
 class ItemTag(models.Model):
     tag = models.CharField(max_length=100)
     content_type = models.ForeignKey(ContentType, models.CASCADE)
-    object_id = models.PositiveIntegerField()
+    object_id = models.CharField(max_length=24)
     content_object = GenericForeignKey("content_type", "object_id")
 
 

tests/aggregation_regress/tests.py

@@ -6,7 +6,6 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError
-from django.db import connection
 from django.db.models import (
     Aggregate,
     Avg,
@@ -184,7 +183,7 @@ def test_annotation_with_value(self):
             )
             .annotate(sum_discount=Sum("discount_price"))
         )
-        with self.assertNumQueries(1) as ctx:
+        with self.assertNumQueries(1):
             self.assertSequenceEqual(
                 values,
                 [
@@ -194,8 +193,8 @@ def test_annotation_with_value(self):
                     }
                 ],
             )
-        if connection.features.allows_group_by_select_index:
-            self.assertIn("GROUP BY 1", ctx[0]["sql"])
+        # if connection.features.allows_group_by_select_index:
+        #     self.assertIn("GROUP BY 1", ctx[0]["sql"])
 
     def test_aggregates_in_where_clause(self):
         """
@@ -829,7 +828,7 @@ def test_empty(self):
             ],
         )
 
-    def test_more_more(self):
+    def test_more_more1(self):
         # Regression for #10113 - Fields mentioned in order_by() must be
         # included in the GROUP BY. This only becomes a problem when the
         # order_by introduces a new join.
@@ -849,6 +848,7 @@ def test_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more2(self):
         # Regression for #10127 - Empty select_related() works with annotate
         qs = (
             Book.objects.filter(rating__lt=4.5)
@@ -877,6 +877,7 @@ def test_more_more(self):
             lambda b: (b.name, b.authors__age__avg, b.publisher.name, b.contact.name),
         )
 
+    def test_more_more3(self):
         # Regression for #10132 - If the values() clause only mentioned extra
         # (select=) columns, those columns are used for grouping
         qs = (
@@ -911,6 +912,7 @@ def test_more_more(self):
             ],
         )
 
+    def test_more_more4(self):
         # Regression for #10182 - Queries with aggregate calls are correctly
         # realiased when used in a subquery
         ids = (
@@ -927,6 +929,7 @@ def test_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more5(self):
         # Regression for #15709 - Ensure each group_by field only exists once
         # per query
         qstr = str(
@@ -1023,7 +1026,7 @@ def test_pickle(self):
             query,
         )
 
-    def test_more_more_more(self):
+    def test_more_more_more1(self):
         # Regression for #10199 - Aggregate calls clone the original query so
         # the original query can still be used
         books = Book.objects.all()
@@ -1042,6 +1045,7 @@ def test_more_more_more(self):
             lambda b: b.name,
         )
 
+    def test_more_more_more2(self):
         # Regression for #10248 - Annotations work with dates()
         qs = (
             Book.objects.annotate(num_authors=Count("authors"))
@@ -1056,6 +1060,7 @@ def test_more_more_more(self):
             ],
         )
 
+    def test_more_more_more3(self):
         # Regression for #10290 - extra selects with parameters can be used for
         # grouping.
         qs = (
@@ -1068,6 +1073,7 @@ def test_more_more_more(self):
             qs, [150, 175, 224, 264, 473, 566], lambda b: int(b["sheets"])
         )
 
+    def test_more_more_more4(self):
         # Regression for 10425 - annotations don't get in the way of a count()
         # clause
         self.assertEqual(
@@ -1077,6 +1083,7 @@ def test_more_more_more(self):
             Book.objects.annotate(Count("publisher")).values("publisher").count(), 6
         )
 
+    def test_more_more_more5(self):
         # Note: intentionally no order_by(), that case needs tests, too.
         publishers = Publisher.objects.filter(id__in=[self.p1.id, self.p2.id])
         self.assertEqual(sorted(p.name for p in publishers), ["Apress", "Sams"])
@@ -1100,6 +1107,7 @@ def test_more_more_more(self):
         )
         self.assertEqual(sorted(p.name for p in publishers), ["Apress", "Sams"])
 
+    def test_more_more_more6(self):
         # Regression for 10666 - inherited fields work with annotations and
         # aggregations
         self.assertEqual(
@@ -1152,6 +1160,7 @@ def test_more_more_more(self):
             ],
         )
 
+    def test_more_more_more7(self):
         # Regression for #10766 - Shouldn't be able to reference an aggregate
         # fields in an aggregate() call.
         msg = "Cannot compute Avg('mean_age'): 'mean_age' is an aggregate"