From b81c7562fc33f50166d5120138d6398dc42b13c3 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Tue, 11 May 2021 01:19:44 -0400
Subject: [PATCH] Fixed #32717 -- Fixed filtering of querysets combined with
 the | operator.

Address a long standing bug in a Where.add optimization to discard
equal nodes that was surfaced by implementing equality for Lookup
instances in bbf141bcdc31f1324048af9233583a523ac54c94.

Thanks Shaheed Haque for the report.
---
 django/utils/tree.py           | 2 +-
 docs/releases/3.2.3.txt        | 3 +++
 tests/queries/tests.py         | 4 ++++
 tests/utils_tests/test_tree.py | 5 +++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/django/utils/tree.py b/django/utils/tree.py
index 302cd37d5f6..af17be939cc 100644
--- a/django/utils/tree.py
+++ b/django/utils/tree.py
@@ -90,7 +90,7 @@ class Node:
         If `squash` is False the data is prepared and added as a child to
         this tree without further logic.
         """
-        if data in self.children:
+        if self.connector == conn_type and data in self.children:
             return data
         if not squash:
             self.children.append(data)
diff --git a/docs/releases/3.2.3.txt b/docs/releases/3.2.3.txt
index 14a143b203d..315678b92a5 100644
--- a/docs/releases/3.2.3.txt
+++ b/docs/releases/3.2.3.txt
@@ -10,3 +10,6 @@ Bugfixes
 ========
 
 * Prepared for ``mysqlclient`` > 2.0.3 support (:ticket:`32732`).
+
+* Fixed a regression in Django 3.2 that caused the incorrect filtering of
+  querysets combined with the ``|`` operator (:ticket:`32717`).
diff --git a/tests/queries/tests.py b/tests/queries/tests.py
index f6437e1175c..ac4e8849c4b 100644
--- a/tests/queries/tests.py
+++ b/tests/queries/tests.py
@@ -1322,6 +1322,10 @@ class Queries4Tests(TestCase):
         self.assertEqual(len(combined), 1)
         self.assertEqual(combined[0].name, 'a1')
 
+    def test_combine_or_filter_reuse(self):
+        combined = Author.objects.filter(name='a1') | Author.objects.filter(name='a3')
+        self.assertEqual(combined.get(name='a1'), self.a1)
+
     def test_join_reuse_order(self):
         # Join aliases are reused in order. This shouldn't raise AssertionError
         # because change_map contains a circular reference (#26522).
diff --git a/tests/utils_tests/test_tree.py b/tests/utils_tests/test_tree.py
index 154678ff578..279e8813b9f 100644
--- a/tests/utils_tests/test_tree.py
+++ b/tests/utils_tests/test_tree.py
@@ -57,6 +57,11 @@ class NodeTests(unittest.TestCase):
         self.assertEqual(len(self.node1) + 1, len(node3))
         self.assertEqual(str(node3), "(DEFAULT: ('a', 1), ('b', 2), ('c', 3))")
 
+    def test_add_eq_child_mixed_connector(self):
+        node = Node(['a', 'b'], 'OR')
+        self.assertEqual(node.add('a', 'AND'), 'a')
+        self.assertEqual(node, Node([Node(['a', 'b'], 'OR'), 'a'], 'AND'))
+
     def test_negate(self):
         # negated is False by default
         self.assertFalse(self.node1.negated)