diff options
| author | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-05-19 21:43:54 +0200 |
|---|---|---|
| committer | Jesús Leganés Combarro "Piranna" <piranna@gmail.com> | 2012-05-19 21:43:54 +0200 |
| commit | 59bfe75aaec583fdb92668819f021ba18c4595e3 (patch) | |
| tree | 07a58dce5da5649b7e1630fa5e0b35b5589f54a7 /sqlparse/lexer.py | |
| parent | 8bd03f158343bd2b83802c1059e15953c72f9f36 (diff) | |
| parent | 66742da10ebdc2bc485022ecbd59278d3fc96488 (diff) | |
| download | sqlparse-59bfe75aaec583fdb92668819f021ba18c4595e3.tar.gz | |
Merge branch 'master' into antiorm
Conflicts:
sqlparse/filters.py
Diffstat (limited to 'sqlparse/lexer.py')
| -rw-r--r-- | sqlparse/lexer.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py index dc794ab..5b0f116 100644 --- a/sqlparse/lexer.py +++ b/sqlparse/lexer.py @@ -179,6 +179,9 @@ class Lexer(object): (r'\$([a-zA-Z_][a-zA-Z0-9_]*)?\$', tokens.Name.Builtin), (r'\?{1}', tokens.Name.Placeholder), (r'[$:?%][a-zA-Z0-9_]+', tokens.Name.Placeholder), + # FIXME(andi): VALUES shouldn't be listed here + # see https://github.com/andialbrecht/sqlparse/pull/64 + (r'VALUES', tokens.Keyword), (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), |