Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix param format bug #378

Merged
merged 3 commits into from
Apr 26, 2024
Merged

Fix param format bug #378

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a678d68
Fix param format bug
dauinsight Apr 4, 2024
4ba6dfb
Merge branch 'dev' into fix-param-format-bug
mShan0 Apr 25, 2024
c730916
fix null case
mShan0 Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions mssql/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,11 +618,14 @@ def format_sql(self, sql, params):
return sql

def format_group_by_params(self, query, params):
# Prepare query for string formatting
query = re.sub(r'%\w+', '{}', query)

if params:
# Insert None params directly into the query
if None in params:
null_params = ['NULL' if param is None else '%s' for param in params]
query = query % tuple(null_params)
null_params = ['NULL' if param is None else '{}' for param in params]
query = query.format(*null_params)
params = tuple(p for p in params if p is not None)
params = [(param, type(param)) for param in params]
params_dict = {param: '@var%d' % i for i, param in enumerate(set(params))}
Expand All @@ -634,8 +637,7 @@ def format_group_by_params(self, query, params):
datatype = self._as_sql_type(key[1], key[0])
variables.append("%s %s = %%s " % (value, datatype))
params.append(key[0])
query = ('DECLARE %s \n' % ','.join(variables)) + (query % tuple(args))

query = ('DECLARE %s \n' % ','.join(variables)) + (query.format(*args))
return query, params

def format_params(self, params):
Expand Down
Loading