Skip to content

Preserve single grouped expressions in function parameters #889

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

Open
emme1t wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −1
Open

Preserve single grouped expressions in function parameters #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion sqlparse/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,8 @@ def get_parameters(self):
for token in parenthesis.tokens:
if isinstance(token, IdentifierList):
return token.get_identifiers()
elif imt(token, i=(Function, Identifier, TypedLiteral),
elif imt(token, i=(Function, Identifier, TypedLiteral,
Operation, Parenthesis, Case, Comparison),
t=T.Literal):
result.append(token)
return result
Expand Down
15 changes: 15 additions & 0 deletions tests/test_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,21 @@ def test_parse_function_param_single_literal():
assert t[0].ttype is T.Number.Integer


@pytest.mark.parametrize('argument, cls', [
('1 + 2', sql.Operation),
('(1 + 2)', sql.Parenthesis),
('CASE WHEN 1 THEN 2 ELSE 3 END', sql.Case),
('1 = 2', sql.Comparison),
])
def test_parse_function_param_single_grouped_expression(argument, cls):
function = sqlparse.parse(f'abs({argument})')[0].tokens[0]
parameters = list(function.get_parameters())

assert len(parameters) == 1
assert isinstance(parameters[0], cls)
assert str(parameters[0]) == argument


def test_parse_nested_function():
t = sqlparse.parse('foo(bar(5))')[0].tokens[0].get_parameters()
assert len(t) == 1
Expand Down