mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-05 22:16:41 +00:00
Code Issues 32 Releases Wiki Activity

[3.0.x] Fixed #30986 -- Fixed queryset crash when filtering against boolean RawSQL expressions on Oracle.

Browse Source 
Backport of 8685e764efd2957085762d9249e07794d9a58dcb from master
This commit is contained in:
Mariusz Felisiak 2019-11-15 10:25:39 +01:00
parent fa6076daf4
commit b6be0699b9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/backends/oracle/operations.py
View File

@ -6,7 +6,7 @@ from functools import lru_cache
from django.conf import settings
from django.db.backends.base.operations import BaseDatabaseOperations
from django.db.backends.utils import strip_quotes, truncate_name
from django.db.models.expressions import Exists, ExpressionWrapper
from django.db.models.expressions import Exists, ExpressionWrapper, RawSQL
from django.db.models.query_utils import Q
from django.db.utils import DatabaseError
from django.utils import timezone
@ -625,4 +625,6 @@ END;
return True
if isinstance(expression, ExpressionWrapper) and isinstance(expression.expression, Q):
return True
if isinstance(expression, RawSQL) and expression.conditional:
return True
return False

8
tests/expressions/tests.py
View File

@ -91,6 +91,14 @@ class BasicExpressionsTests(TestCase):
2,
)
def test_filtering_on_rawsql_that_is_boolean(self):
self.assertEqual(
Company.objects.filter(
RawSQL('num_employees > %s', (3,), output_field=models.BooleanField()),
).count(),
2,
)
def test_filter_inter_attribute(self):
# We can filter on attribute relationships on same model obj, e.g.
# find companies where the number of employees is greater