mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-27 23:56:08 +00:00
Code Issues 32 Releases Wiki Activity

[3.2.x] Fixed #32548 -- Fixed crash when combining Q() objects with boolean expressions.

Browse Source 
Backport of 00b0786de5 from main.

Regression in 466920f6d7.
This commit is contained in:
Jonathan Richards
2021-03-14 14:00:40 -07:00
committed by Mariusz Felisiak
parent 65dfb06a1a
commit d0267690f8
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 .models import Tag
class QTests(SimpleTestCase):
def test_combine_and_empty(self):
@@ -39,17 +41,14 @@ class QTests(SimpleTestCase):
q = Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct()
self.assertEqual(path, 'django.db.models.Q')
self.assertEqual(args, ())
self.assertEqual(kwargs, {'price__gt': F('discounted_price')})
self.assertEqual(args, (('price__gt', F('discounted_price')),))
self.assertEqual(kwargs, {})
def test_deconstruct_negated(self):
q = ~Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct()
self.assertEqual(args, ())
self.assertEqual(kwargs, {
'price__gt': F('discounted_price'),
'_negated': True,
})
self.assertEqual(args, (('price__gt', F('discounted_price')),))
self.assertEqual(kwargs, {'_negated': True})
def test_deconstruct_or(self):
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(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):
q = Q(price__gt=F('discounted_price'))
path, args, kwargs = q.deconstruct()