diff options
| -rw-r--r-- | sqlparse/lexer.py | 3 | ||||
| -rw-r--r-- | tests/test_parse.py | 4 |
2 files changed, 6 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), diff --git a/tests/test_parse.py b/tests/test_parse.py index 6d7f7df..d77bb43 100644 --- a/tests/test_parse.py +++ b/tests/test_parse.py @@ -99,6 +99,10 @@ class SQLParseTest(TestCaseBase): self.assert_(t[-1].ttype is sqlparse.tokens.Name.Placeholder) self.assertEqual(t[-1].value, '$a') + def test_modulo_not_placeholder(self): + tokens = list(sqlparse.lexer.tokenize('x %3')) + self.assertEqual(tokens[2][0], sqlparse.tokens.Operator) + def test_access_symbol(self): # see issue27 t = sqlparse.parse('select a.[foo bar] as foo')[0].tokens self.assert_(isinstance(t[-1], sqlparse.sql.Identifier)) |