Improve parsing of inline comments for identifiers (fixes andialbrecht#163).

andialbrecht · andialbrecht · commit a17db7a75570 · 2015-01-16T21:45:32.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -5,7 +5,8 @@ Bug Fixes
 * Fix a regression for identifiers with square bracktes notation (issue153).
 
 Enhancements
-* Improved formatting of HAVING statements.
+* Improve formatting of HAVING statements.
+* Improve parsing of inline comments (issue163).
 
 
 Release 0.1.14 (Nov 30, 2014)
diff --git a/sqlparse/engine/grouping.py b/sqlparse/engine/grouping.py
@@ -172,6 +172,8 @@ def _consume_cycle(tl, i):
             if next(x)(t):
                 yield t
             else:
+                if isinstance(t, sql.Comment) and t.is_multiline():
+                    yield t
                 raise StopIteration
 
     def _next_token(tl, i):
diff --git a/sqlparse/sql.py b/sqlparse/sql.py
@@ -559,6 +559,9 @@ class Comment(TokenList):
     """A comment."""
     __slots__ = ('value', 'ttype', 'tokens')
 
+    def is_multiline(self):
+        return self.tokens and self.tokens[0].ttype == T.Comment.Multiline
+
 
 class Where(TokenList):
     """A WHERE clause."""
diff --git a/tests/test_grouping.py b/tests/test_grouping.py
@@ -131,6 +131,12 @@ def test_identifier_list_other(self):  # issue2
         l = p.tokens[2]
         self.assertEqual(len(l.tokens), 13)
 
+    def test_identifier_list_with_inline_comments(self):  # issue163
+        p = sqlparse.parse('foo /* a comment */, bar')[0]
+        self.assert_(isinstance(p.tokens[0], sql.IdentifierList))
+        self.assert_(isinstance(p.tokens[0].tokens[0], sql.Identifier))
+        self.assert_(isinstance(p.tokens[0].tokens[3], sql.Identifier))
+
     def test_where(self):
         s = 'select * from foo where bar = 1 order by id desc'
         p = sqlparse.parse(s)[0]
