mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-12-01 07:48:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #32231 -- Allowed passing None params to QuerySet.raw().

Browse source
This commit is contained in:
Alexander Lyabah 2020-11-28 18:08:27 +02:00 • committed by Mariusz Felisiak
parent aa3d360631
commit 415f50298f
5 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
django/db/models/sql/query.py
View file

@ -69,8 +69,8 @@ JoinInfo = namedtuple(
class RawQuery:
"""A single raw SQL query."""
def __init__(self, sql, using, params=None):
self.params = params or ()
def __init__(self, sql, using, params=()):
self.params = params
self.sql = sql
self.using = using
self.cursor = None
@ -111,9 +111,13 @@ class RawQuery:
@property
def params_type(self):
if self.params is None:
return None
return dict if isinstance(self.params, Mapping) else tuple
def __str__(self):
if self.params_type is None:
return self.sql
return self.sql % self.params_type(self.params)
def _execute_query(self):
@ -127,6 +131,8 @@ class RawQuery:
params = tuple(adapter(val) for val in self.params)
elif params_type is dict:
params = {key: adapter(val) for key, val in self.params.items()}
elif params_type is None:
params = None
else:
raise RuntimeError("Unexpected params type: %s" % params_type)