Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions sqlparse/keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def find_delimited_spans(text):
(r"`(``|[^`])*`", tokens.Name),
(r"´(´´|[^´])*´", tokens.Name),

(r'@\?', tokens.Operator),
(r'\?', tokens.Name.Placeholder),
(r'%(\(\w+\))?s', tokens.Name.Placeholder),
(r'(?<!\w)[$:?]\w+', tokens.Name.Placeholder),
Expand Down
9 changes: 9 additions & 0 deletions tests/test_format.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,15 @@ def test_bools(self):
assert self.formatter(
sql) == 'select * from table where a && b or c || d'

def test_json_path_operator(self):
sql = 'select data@?? from table'
assert self.formatter(sql) == 'select data @? ? from table'

@pytest.mark.parametrize('operator', ['||', '|', '&'])
def test_operator_after_placeholder(self, operator):
sql = f'select ?{operator}? from table'
assert self.formatter(sql) == f'select ? {operator} ? from table'

def test_nested(self):
sql = 'select *, case when a-b then c end from table'
assert self.formatter(
Expand Down
4 changes: 2 additions & 2 deletions tests/test_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -632,8 +632,8 @@ def test_configurable_regex():
@pytest.mark.parametrize('sql', [
'->', '->>', '#>', '#>>',
'@>', '<@',
# leaving ? out for now, they're somehow ambiguous as placeholders
# '?', '?|', '?&',
# Question-mark prefixes remain ambiguous with placeholders.
'@?', '@@',
'||', '-', '#-'
])
def test_json_operators(sql):
Expand Down