innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #32548 -- Fixed crash when combining Q() objects with boolean expressions.

This commit is contained in:
Jonathan Richards 2021-03-14 14:00:40 -07:00 committed by Mariusz Felisiak
parent 54f60bc85d
commit 00b0786de5
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
django/db/models/query_utils.py
View File

@ -84,14 +84,10 @@ class Q(tree.Node):
path = '%s.%s' % (self.__class__.__module__, self.__class__.__name__) path = '%s.%s' % (self.__class__.__module__, self.__class__.__name__)
if path.startswith('django.db.models.query_utils'): if path.startswith('django.db.models.query_utils'):
path = path.replace('django.db.models.query_utils', 'django.db.models') path = path.replace('django.db.models.query_utils', 'django.db.models')
args, kwargs = (), {} args = tuple(self.children)
if len(self.children) == 1 and not isinstance(self.children[0], Q): kwargs = {}
child = self.children[0] if self.connector != self.default:
kwargs = {child[0]: child[1]} kwargs['_connector'] = self.connector
else:
args = tuple(self.children)
if self.connector != self.default:
kwargs = {'_connector': self.connector}
if self.negated: if self.negated:
kwargs['_negated'] = True kwargs['_negated'] = True
return path, args, kwargs return path, args, kwargs

4
tests/expressions/tests.py
View File

@ -833,6 +833,10 @@ class BasicExpressionsTests(TestCase):
Q() & Exists(is_poc), Q() & Exists(is_poc),
Exists(is_poc) | Q(), Exists(is_poc) | Q(),
Q() | Exists(is_poc), Q() | Exists(is_poc),
Q(Exists(is_poc)) & Q(),
Q() & Q(Exists(is_poc)),
Q(Exists(is_poc)) | Q(),
Q() | Q(Exists(is_poc)),
] ]
for conditions in tests: for conditions in tests:
with self.subTest(conditions): with self.subTest(conditions):

22
tests/queries/test_q.py
View File

@ -1,6 +1,8 @@
from django.db.models import F, Q from django.db.models import Exists, F, OuterRef, Q
from django.test import SimpleTestCase from django.test import SimpleTestCase
from .models import Tag
class QTests(SimpleTestCase): class QTests(SimpleTestCase):
def test_combine_and_empty(self): def test_combine_and_empty(self):
@ -39,17 +41,14 @@ class QTests(SimpleTestCase):
q = Q(price__gt=F('discounted_price')) q = Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct() path, args, kwargs = q.deconstruct()
self.assertEqual(path, 'django.db.models.Q') self.assertEqual(path, 'django.db.models.Q')
self.assertEqual(args, ()) self.assertEqual(args, (('price__gt', F('discounted_price')),))
self.assertEqual(kwargs, {'price__gt': F('discounted_price')}) self.assertEqual(kwargs, {})
def test_deconstruct_negated(self): def test_deconstruct_negated(self):
q = ~Q(price__gt=F('discounted_price')) q = ~Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct() path, args, kwargs = q.deconstruct()
self.assertEqual(args, ()) self.assertEqual(args, (('price__gt', F('discounted_price')),))
self.assertEqual(kwargs, { self.assertEqual(kwargs, {'_negated': True})
'price__gt': F('discounted_price'),
'_negated': True,
})
def test_deconstruct_or(self): def test_deconstruct_or(self):
q1 = Q(price__gt=F('discounted_price')) q1 = Q(price__gt=F('discounted_price'))
@ -88,6 +87,13 @@ class QTests(SimpleTestCase):
self.assertEqual(args, (Q(price__gt=F('discounted_price')),)) self.assertEqual(args, (Q(price__gt=F('discounted_price')),))
self.assertEqual(kwargs, {}) self.assertEqual(kwargs, {})
def test_deconstruct_boolean_expression(self):
tagged = Tag.objects.filter(category=OuterRef('pk'))
q = Q(Exists(tagged))
_, args, kwargs = q.deconstruct()
self.assertEqual(args, (Exists(tagged),))
self.assertEqual(kwargs, {})
def test_reconstruct(self): def test_reconstruct(self):
q = Q(price__gt=F('discounted_price')) q = Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct() path, args, kwargs = q.deconstruct()