diff options
| -rw-r--r-- | sqlparse/filters.py | 6 | ||||
| -rw-r--r-- | sqlparse/lexer.py | 8 | ||||
| -rw-r--r-- | tests/test_format.py | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/sqlparse/filters.py b/sqlparse/filters.py index 7b9b5e7..9c0a476 100644 --- a/sqlparse/filters.py +++ b/sqlparse/filters.py @@ -271,7 +271,11 @@ class StripWhitespaceFilter: [self.process(stack, sgroup, depth + 1) for sgroup in stmt.get_sublists()] self._stripws(stmt) - if depth == 0 and stmt.tokens[-1].is_whitespace(): + if ( + depth == 0 + and stmt.tokens + and stmt.tokens[-1].is_whitespace() + ): stmt.tokens.pop(-1) diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py index a60c789..3e9a1a6 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -315,7 +315,13 @@ class Lexer(object): statestack.pop() elif state == '#push': statestack.append(statestack[-1]) - else: + elif ( + # Ugly hack - multiline-comments + # are not stackable + state != 'multiline-comments' + or not statestack + or statestack[-1] != 'multiline-comments' + ): statestack.append(state) elif isinstance(new_state, int): # pop diff --git a/tests/test_format.py b/tests/test_format.py index b789b17..a105b1c 100644 --- a/tests/test_format.py +++ b/tests/test_format.py @@ -61,6 +61,9 @@ class TestFormat(TestCaseBase): sql = 'select (/* sql starts here */ select 2)' res = sqlparse.format(sql, strip_comments=True) self.ndiffAssertEqual(res, 'select (select 2)') + sql = 'select (/* sql /* starts here */ select 2)' + res = sqlparse.format(sql, strip_comments=True) + self.ndiffAssertEqual(res, 'select (select 2)') def test_strip_ws(self): f = lambda sql: sqlparse.format(sql, strip_whitespace=True) |