mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Refs #33308 -- Avoided passing None to RawSQL's params. 

Passing None to params causes errors in determining the data type on
psycopg3.
This commit is contained in:
Florian Apolloner 2022-12-02 10:43:49 +01:00 committed by Mariusz Felisiak
parent 2fecf99ade
commit 3e3b7f691b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/queries/test_query.py
View File

@ -164,12 +164,12 @@ class TestQuery(SimpleTestCase):
class TestQueryNoModel(TestCase): class TestQueryNoModel(TestCase):
def test_rawsql_annotation(self): def test_rawsql_annotation(self):
query = Query(None) query = Query(None)
sql = "%s IS NULL" sql = "%s = 1"
# Wrap with a CASE WHEN expression if a database backend (e.g. Oracle) # Wrap with a CASE WHEN expression if a database backend (e.g. Oracle)
# doesn't support boolean expression in SELECT list. # doesn't support boolean expression in SELECT list.
if not connection.features.supports_boolean_expr_in_select_clause: if not connection.features.supports_boolean_expr_in_select_clause:
sql = f"CASE WHEN {sql} THEN 1 ELSE 0 END" sql = f"CASE WHEN {sql} THEN 1 ELSE 0 END"
query.add_annotation(RawSQL(sql, (None,), BooleanField()), "_check") query.add_annotation(RawSQL(sql, (1,), BooleanField()), "_check")
result = query.get_compiler(using=DEFAULT_DB_ALIAS).execute_sql(SINGLE) result = query.get_compiler(using=DEFAULT_DB_ALIAS).execute_sql(SINGLE)
self.assertEqual(result[0], 1) self.assertEqual(result[0], 1)
@ -183,8 +183,7 @@ class TestQueryNoModel(TestCase):
def test_q_annotation(self): def test_q_annotation(self):
query = Query(None) query = Query(None)
check = ExpressionWrapper( check = ExpressionWrapper(
Q(RawSQL("%s IS NULL", (None,), BooleanField())) Q(RawSQL("%s = 1", (1,), BooleanField())) | Q(Exists(Item.objects.all())),
| Q(Exists(Item.objects.all())),
BooleanField(), BooleanField(),
) )
query.add_annotation(check, "_check") query.add_annotation(check, "_check")