summaryrefslogtreecommitdiff
path: root/sqlparse
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2011-07-25 18:24:02 +0200
committerAndi Albrecht <albrecht.andi@gmail.com>2011-07-25 18:24:02 +0200
commit0ec64528c5fb1efb71122985eab9c7137a80603d (patch)
treedbd4330ac149c12cb7dba54b0ad3fa54f108facd /sqlparse
parentc078f16a40a832df5c0dcb58c982d6941dbe879f (diff)
downloadsqlparse-0ec64528c5fb1efb71122985eab9c7137a80603d.tar.gz
Detection of placeholders in paramterized queries (fixes issue22).
Diffstat (limited to 'sqlparse')
-rw-r--r--sqlparse/lexer.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index 507217a..950ef1b 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -175,6 +175,9 @@ class Lexer:
(r'CASE\b', tokens.Keyword), # extended CASE(foo)
(r"`(``|[^`])*`", tokens.Name),
(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-Z_][a-zA-Z0-9_]+', tokens.Name),
(r'[a-zA-Z_][a-zA-Z0-9_]*(?=[.(])', tokens.Name), # see issue39
(r'[<>=~!]+', tokens.Operator.Comparison),
@@ -191,7 +194,6 @@ class Lexer:
(r'NOT NULL\b', tokens.Keyword),
(r'CREATE( OR REPLACE)?\b', tokens.Keyword.DDL),
(r'[a-zA-Z_][a-zA-Z0-9_]*', is_keyword),
- (r'\$([a-zA-Z_][a-zA-Z0-9_]*)?\$', tokens.Name.Builtin),
(r'[;:()\[\],\.]', tokens.Punctuation),
],
'multiline-comments': [