Merge pull request #639 from jazzband/django51-compat-_process_aggregate_args

Add aggregate query on empty tables tests for dj 5.1+ compat

Author: bckohan

polymorphic/tests/migrations/0001_initial.py

@@ -2064,4 +2064,86 @@ class Migration(migrations.Migration):
             },
             bases=("auth.group", models.Model),
         ),
+        migrations.CreateModel(
+            name="ModelArticle",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "polymorphic_ctype",
+                    models.ForeignKey(
+                        editable=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="polymorphic_oms.article_set+",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "sales_points",
+                    models.IntegerField(null=True),
+                ),
+            ],
+        ),
+        migrations.CreateModel(
+            name="ModelPackage",
+            fields=[
+                (
+                    "modelarticle_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="tests.modelarticle",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+            ],
+            bases=("tests.modelarticle", models.Model),
+        ),
+        migrations.CreateModel(
+            name="ModelComponent",
+            fields=[
+                (
+                    "modelarticle_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="tests.modelarticle",
+                    ),
+                ),
+                ("name", models.CharField(max_length=100)),
+            ],
+            bases=("tests.modelarticle", models.Model),
+        ),
+        migrations.CreateModel(
+            name="ModelOrderLine",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "articles",
+                    models.ManyToManyField(related_name="modelorderline", to="tests.ModelArticle"),
+                ),
+            ]
+        )
     ]

polymorphic/tests/models.py

@@ -189,6 +189,22 @@ class ModelWithMyManager2(ShowFieldTypeAndContent, Model2A):
     field4 = models.CharField(max_length=10)
 
 
+class ModelArticle(PolymorphicModel):
+    sales_points = models.IntegerField()
+
+
+class ModelPackage(ModelArticle):
+    name = models.CharField(max_length=100)
+
+
+class ModelComponent(ModelArticle):
+    name = models.CharField(max_length=100)
+
+
+class ModelOrderLine(models.Model):
+    articles = models.ManyToManyField(ModelArticle, related_name="orderline")
+
+
 class MROBase1(ShowFieldType, PolymorphicModel):
     objects = MyManager()
     field1 = models.CharField(max_length=10)  # needed as MyManager uses it

polymorphic/tests/test_orm.py

@@ -4,7 +4,7 @@
 
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.db.models import Case, Count, FilteredRelation, Q, When
+from django.db.models import Case, Count, FilteredRelation, Q, Sum, When
 from django.db.utils import IntegrityError
 from django.test import TransactionTestCase
 
@@ -35,6 +35,7 @@
     ModelExtraC,
     ModelExtraExternal,
     ModelFieldNameTest,
+    ModelOrderLine,
     ModelShow1,
     ModelShow1_plain,
     ModelShow2,
@@ -992,6 +993,12 @@ def test_polymorphic__aggregate(self):
         ):
             Model2A.objects.aggregate(Count("Model2B___field2"))
 
+    def test_polymorphic__aggregate_empty_queryset(self):
+        """test the fix for test___lookup in Django 5.1+"""
+        line = ModelOrderLine.objects.create()
+        result = line.articles.aggregate(Sum("sales_points"))
+        assert result == {"sales_points__sum": None}
+
     def test_polymorphic__complex_aggregate(self):
         """test (complex expression on) aggregate (should work for annotate either)"""