From 16dbc49a3fb4928365550775efa925640b4cb768 Mon Sep 17 00:00:00 2001 From: Andi Albrecht Date: Sun, 24 Jul 2011 00:56:18 +0200 Subject: Releax keyword detection, when keywords are used as function names (fixes issue36). --- sqlparse/lexer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sqlparse') 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), -- cgit v1.2.1