From eaf9764d3bb25970da89de5799d8d308715628ba Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Tue, 15 Sep 2020 11:40:59 +0200
Subject: Fixed #32007 -- Fixed queryset crash with Q() annotation and
 aggregation.

Thanks Gordon Wrigley for the report.

Regression in 8a6df55f2dd5131282084a4edfd48f63fbf8c69a.
---
 docs/releases/3.1.2.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs')

diff --git a/docs/releases/3.1.2.txt b/docs/releases/3.1.2.txt
index f9e45370ab..fa820c78ee 100644
--- a/docs/releases/3.1.2.txt
+++ b/docs/releases/3.1.2.txt
@@ -16,3 +16,6 @@ Bugfixes
   attribute returned incorrectly ``True`` for ``GROUP BY`` queries (e.g.
   ``.annotate().values()``) on models with ``Meta.ordering``. A model's
   ``Meta.ordering`` doesn't affect such queries (:ticket:`31990`).
+
+* Fixed a regression in Django 3.1 where a queryset would crash if it contained
+  an aggregation and a ``Q`` object annotation (:ticket:`32007`).
-- 
cgit v1.3