From 466920f6d726eee90d5566e0a9948e92b33a122e Mon Sep 17 00:00:00 2001
From: starryrbs <1322096624@qq.com>
Date: Thu, 18 Feb 2021 00:04:59 +0800
Subject: [PATCH] Fixed #32450 -- Fixed crash when ANDing/ORing an empty Q()
 with not pickleable Q().

Regression in bb0b6e526340e638522e093765e534df4e4393d2.
---
 django/db/models/query_utils.py | 7 ++++---
 tests/queries/test_q.py         | 8 ++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/django/db/models/query_utils.py b/django/db/models/query_utils.py
index c2623f099f..c957ffa564 100644
--- a/django/db/models/query_utils.py
+++ b/django/db/models/query_utils.py
@@ -5,7 +5,6 @@ Factored out from django.db.models.query to avoid making the main module very
 large and/or so that they can be used by other modules without getting into
 circular import difficulties.
 """
-import copy
 import functools
 import inspect
 from collections import namedtuple
@@ -46,10 +45,12 @@ class Q(tree.Node):
 
         # If the other Q() is empty, ignore it and just use `self`.
         if not other:
-            return copy.deepcopy(self)
+            _, args, kwargs = self.deconstruct()
+            return type(self)(*args, **kwargs)
         # Or if this Q is empty, ignore it and just use `other`.
         elif not self:
-            return copy.deepcopy(other)
+            _, args, kwargs = other.deconstruct()
+            return type(other)(*args, **kwargs)
 
         obj = type(self)()
         obj.connector = conn
diff --git a/tests/queries/test_q.py b/tests/queries/test_q.py
index 9adff07ef2..6dcf36ce02 100644
--- a/tests/queries/test_q.py
+++ b/tests/queries/test_q.py
@@ -8,6 +8,10 @@ class QTests(SimpleTestCase):
         self.assertEqual(q & Q(), q)
         self.assertEqual(Q() & q, q)
 
+        q = Q(x__in={}.keys())
+        self.assertEqual(q & Q(), q)
+        self.assertEqual(Q() & q, q)
+
     def test_combine_and_both_empty(self):
         self.assertEqual(Q() & Q(), Q())
 
@@ -16,6 +20,10 @@ class QTests(SimpleTestCase):
         self.assertEqual(q | Q(), q)
         self.assertEqual(Q() | q, q)
 
+        q = Q(x__in={}.keys())
+        self.assertEqual(q | Q(), q)
+        self.assertEqual(Q() | q, q)
+
     def test_combine_or_both_empty(self):
         self.assertEqual(Q() | Q(), Q())