Merge pull request #172 from JacekPliszka/master

Fix pathological case of empty statement
andialbrecht · Feb 21, 2015 · 51871a8 · 51871a8
2 parents 9eb0b8c + 703aec1
commit 51871a8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
@@ -271,7 +271,11 @@ def process(self, stack, stmt, depth=0):
         [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
@@ -315,7 +315,13 @@ def get_tokens_unprocessed(self, stream, stack=('root',)):
                                     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
@@ -61,6 +61,9 @@ def test_strip_comments_multi(self):
         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)