summaryrefslogtreecommitdiff
path: root/sqlparse
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2011-07-24 00:56:18 +0200
committerAndi Albrecht <albrecht.andi@gmail.com>2011-07-24 00:56:18 +0200
commit16dbc49a3fb4928365550775efa925640b4cb768 (patch)
tree76576aac1ea3c3e61556b4bf01b3840b2d4925b7 /sqlparse
parent693d7a31c1fff960763ff3ba485142ce67ff708f (diff)
downloadsqlparse-16dbc49a3fb4928365550775efa925640b4cb768.tar.gz
Releax keyword detection, when keywords are used as function names (fixes issue36).
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 6304911..507217a 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -172,10 +172,11 @@ class Lexer:
(r':=', tokens.Assignment),
(r'::', tokens.Punctuation),
(r'[*]', tokens.Wildcard),
+ (r'CASE\b', tokens.Keyword), # extended CASE(foo)
(r"`(``|[^`])*`", tokens.Name),
(r"´(´´|[^´])*´", tokens.Name),
(r'@[a-zA-Z_][a-zA-Z0-9_]+', tokens.Name),
- (r'[a-zA-Z_][a-zA-Z0-9_]*(?=\.)', tokens.Name), # see issue39
+ (r'[a-zA-Z_][a-zA-Z0-9_]*(?=[.(])', tokens.Name), # see issue39
(r'[<>=~!]+', tokens.Operator.Comparison),
(r'[+/@#%^&|`?^-]+', tokens.Operator),
(r'0x[0-9a-fA-F]+', tokens.Number.Hexadecimal),