Fix of problem with multiline treated as stackable while /* /* */ is one comment, not two stacked

JacekPliszka · JacekPliszka · commit 703aec1fb30d · 2015-02-12T01:37:46.000+01:00
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)
