Ticket #11293: django_11414_filter_patch.diff

django/db/models/sql/query.py

@@ -1556 +1556 @@
                 entry.add((aggregate, lookup_type, value), AND)
                 if negate:
                     entry.negate()
-                self.having.add(entry, AND)
+                self.having.add(entry, connector)
                 return
 
         opts = self.get_meta()

tests/regressiontests/aggregation_regress/models.py

@@ -318 +318 @@
 ...
 FieldError: Cannot compute Avg('mean_age'): 'mean_age' is an aggregate
 
+# Regressions for #11293
+>>> from django.db.models import Q,F
+>>> Publisher.objects.annotate(rating_sum=Sum('book__rating'), book_count=Count('book')).filter( Q(rating_sum__gt=5.5) | Q(rating_sum__isnull=True)).order_by('pk')
+[<Publisher: Apress>, <Publisher: Prentice Hall>, <Publisher: Jonno's House of Books>]
+>>> Publisher.objects.annotate(rating_sum=Sum('book__rating'), book_count=Count('book')).filter( Q(pk__lt=F('book_count')) | Q(rating_sum=None), name__contains='Jonn' )
+[<Publisher: Jonno's House of Books>]
+>>> Publisher.objects.annotate(rating_sum=Sum('book__rating'), book_count=Count('book')).filter( Q(pk__lt=F('book_count')) | Q(rating_sum=None) ).order_by('pk')
+[<Publisher: Apress>, <Publisher: Jonno's House of Books>]
+
 """
 }