Fixed regular expression for Nameplaces

piranna · piranna · commit 1e3c3b9ceee5 · 2012-03-24T20:14:20.000+01:00
diff --git a/sqlparse/filters.py b/sqlparse/filters.py
@@ -80,13 +80,9 @@ def StripWhitespace(stream):
     ignore_group = frozenset((Comparison, Punctuation))
 
     for token_type, value in stream:
-        # We got a previous token
+        # We got a previous token (not empty first ones)
         if last_type:
-            print repr(token_type), repr(value)
-
             if token_type in Whitespace:
-                print '\t', repr(token_type), repr(value)
-
                 has_space = True
                 continue
 
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
@@ -177,7 +177,7 @@ class Lexer(object):
             (r"&acute;(&acute;&acute;|[^&acute;])*&acute;", tokens.Name),
             (r'\$([a-zA-Z_][a-zA-Z0-9_]*)?\$', tokens.Name.Builtin),
             (r'\?{1}', tokens.Name.Placeholder),
-            (r'[$:?%][a-zA-Z0-9_]+[^$:?%]?', tokens.Name.Placeholder),
+            (r'[$:?%][a-zA-Z0-9_]+', tokens.Name.Placeholder),
             (r'@[a-zA-Z_][a-zA-Z0-9_]+', tokens.Name),
             (r'[a-zA-Z_][a-zA-Z0-9_]*(?=[.(])', tokens.Name),  # see issue39
             (r'[-]?0x[0-9a-fA-F]+', tokens.Number.Hexadecimal),
