diff options
| author | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-03-24 20:14:20 +0100 |
|---|---|---|
| committer | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-03-24 20:14:20 +0100 |
| commit | 1e3c3b9ceee5e5c3cead78cd87a592637e41fe12 (patch) | |
| tree | aeb4479aed2e2b3c465f6e6c317989d5ac647bca /sqlparse | |
| parent | 9e4feb233a45620afca7192e127d88d25fe6b390 (diff) | |
| download | sqlparse-1e3c3b9ceee5e5c3cead78cd87a592637e41fe12.tar.gz | |
Fixed regular expression for Nameplaces
Diffstat (limited to 'sqlparse')
| -rw-r--r-- | sqlparse/filters.py | 6 | ||||
| -rw-r--r-- | sqlparse/lexer.py | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sqlparse/filters.py b/sqlparse/filters.py index c880f58..6bb3415 100644 --- 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 index 64ede4c..321669d 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -177,7 +177,7 @@ class Lexer(object): (r"´(´´|[^´])*´", 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), |