summaryrefslogtreecommitdiff
path: root/sqlparse
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2014-08-08 12:59:51 +0200
committerAndi Albrecht <albrecht.andi@gmail.com>2014-08-08 12:59:51 +0200
commit81479273e5e669abfcd410c4bc85dd39bf89bb2e (patch)
treee2ada6890d9120d84a353614aadd333412cf450e /sqlparse
parent8f5f638b1a0c0759adf122450f9027f47a4a220e (diff)
parent8ffe95af292e0930b7126aae1905a97f7ebdfb24 (diff)
downloadsqlparse-81479273e5e669abfcd410c4bc85dd39bf89bb2e.tar.gz
Merge pull request #143 from fusionbox/master
Handle modulo operator without spaces
Diffstat (limited to 'sqlparse')
-rw-r--r--sqlparse/lexer.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index 0d915ac..6bd414f 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -180,7 +180,8 @@ class Lexer(object):
(r'\$([^\W\d]\w*)?\$', tokens.Name.Builtin),
(r'\?{1}', tokens.Name.Placeholder),
(r'%\(\w+\)s', tokens.Name.Placeholder),
- (r'[$:?%]\w+', tokens.Name.Placeholder),
+ (r'%s', tokens.Name.Placeholder),
+ (r'[$:?]\w+', tokens.Name.Placeholder),
# FIXME(andi): VALUES shouldn't be listed here
# see https://github.com/andialbrecht/sqlparse/pull/64
(r'VALUES', tokens.Keyword),