Recognize MSSQL temp tables and distinguish from MySQL comments (fixes andialbrecht#192).

andialbrecht · andialbrecht · commit 8b5a957f4dad · 2015-07-26T11:05:58.000+02:00
diff --git a/CHANGES b/CHANGES
@@ -5,6 +5,8 @@ Bug Fixes
 * Fix a regression in get_alias() introduced in 0.1.15 (issue185).
 * Fix a bug in the splitter regarding DECLARE (issue193).
 * sqlformat command line tool doesn't duplicat newlines anymore (issue191).
+* Don't mix up MySQL comments starting with hash and MSSQL
+  temp tables (issue192).
 
 
 Release 0.1.15 (Apr 15, 2015)
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
@@ -164,10 +164,10 @@ class Lexer(object):
 
     tokens = {
         'root': [
-            (r'(--|#).*?(\r\n|\r|\n)', tokens.Comment.Single),
+            (r'(--|# ).*?(\r\n|\r|\n)', tokens.Comment.Single),
             # $ matches *before* newline, therefore we have two patterns
             # to match Comment.Single
-            (r'(--|#).*?$', tokens.Comment.Single),
+            (r'(--|# ).*?$', tokens.Comment.Single),
             (r'(\r\n|\r|\n)', tokens.Newline),
             (r'\s+', tokens.Whitespace),
             (r'/\*', tokens.Comment.Multiline, 'multiline-comments'),
@@ -185,7 +185,7 @@ class Lexer(object):
             # FIXME(andi): VALUES shouldn't be listed here
             # see https://github.com/andialbrecht/sqlparse/pull/64
             (r'VALUES', tokens.Keyword),
-            (r'@[^\W\d_]\w+', tokens.Name),
+            (r'(@|##|#)[^\W\d_]\w+', tokens.Name),
             # IN is special, it may be followed by a parenthesis, but
             # is never a functino, see issue183
             (r'in\b(?=[ (])?', tokens.Keyword),
diff --git a/tests/test_parse.py b/tests/test_parse.py
@@ -293,3 +293,13 @@ def test_single_line_comments(sql):
     assert p.tokens[-1].ttype == T.Comment.Single
 
 
+@pytest.mark.parametrize('sql', [
+    'foo',
+    '@foo',
+    '#foo',  # see issue192
+    '##foo'
+])
+def test_names_and_special_names(sql):
+    p = sqlparse.parse(sql)[0]
+    assert len(p.tokens) == 1
+    assert isinstance(p.tokens[0], sqlparse.sql.Identifier)
