summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Albrecht <albrecht.andi@gmail.com>2011-02-28 21:23:41 +0100
committerAndi Albrecht <albrecht.andi@gmail.com>2011-02-28 21:23:41 +0100
commit2bd7658034545aa7db5752cd35d400526af5439e (patch)
tree53c21e0814fdace5e7352e05575c6d7decc1c1cc
parent94e33797f7324540e9d64a623fc7c1aa18507318 (diff)
downloadsqlparse-2bd7658034545aa7db5752cd35d400526af5439e.tar.gz
Handle REPLACE as DML token and recognize hex numbers (thanks Ervin).
-rw-r--r--sqlparse/keywords.py2
-rw-r--r--sqlparse/lexer.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
index 917601d..f518974 100644
--- a/sqlparse/keywords.py
+++ b/sqlparse/keywords.py
@@ -343,7 +343,6 @@ KEYWORDS = {
'RELATIVE': tokens.Keyword,
'RENAME': tokens.Keyword,
'REPEATABLE': tokens.Keyword,
- 'REPLACE': tokens.Keyword,
'RESET': tokens.Keyword,
'RESTART': tokens.Keyword,
'RESTRICT': tokens.Keyword,
@@ -528,6 +527,7 @@ KEYWORDS_COMMON = {
'INSERT': tokens.Keyword.DML,
'DELETE': tokens.Keyword.DML,
'UPDATE': tokens.Keyword.DML,
+ 'REPLACE': tokens.Keyword.DML,
'DROP': tokens.Keyword.DDL,
'CREATE': tokens.Keyword.DDL,
'ALTER': tokens.Keyword.DDL,
diff --git a/sqlparse/lexer.py b/sqlparse/lexer.py
index d381e36..937cfbd 100644
--- a/sqlparse/lexer.py
+++ b/sqlparse/lexer.py
@@ -177,6 +177,7 @@ class Lexer:
(r'@[a-zA-Z_][a-zA-Z0-9_]+', tokens.Name),
(r'[<>=~!]+', tokens.Operator.Comparison),
(r'[+/@#%^&|`?^-]+', tokens.Operator),
+ (r'0x[0-9a-fA-F]+', tokens.Number.Hexadecimal),
(r'[0-9]*\.[0-9]+', tokens.Number.Float),
(r'[0-9]+', tokens.Number.Integer),
# TODO: Backslash escapes?