diff options
| author | Cristian Orellana <cristiano@groupon.com> | 2014-01-09 16:07:02 -0800 |
|---|---|---|
| committer | Cristian Orellana <cristiano@groupon.com> | 2014-01-09 16:07:02 -0800 |
| commit | 930895f66400a03357942ec5baedeebcbe64defc (patch) | |
| tree | 976a56dea1de6abefbd8c62be9763ae0dccb1d4e | |
| parent | f871291d33df018bf38cd62df3781456c8914210 (diff) | |
| download | sqlparse-930895f66400a03357942ec5baedeebcbe64defc.tar.gz | |
Fix: fixed COALESCE keyword, it had a type. Add: Added MERGE keyword
| -rw-r--r-- | sqlparse/keywords.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py index 1675d81..e6c258e 100644 --- a/sqlparse/keywords.py +++ b/sqlparse/keywords.py @@ -61,7 +61,7 @@ KEYWORDS = { 'CLOB': tokens.Keyword, 'CLOSE': tokens.Keyword, 'CLUSTER': tokens.Keyword, - 'COALSECE': tokens.Keyword, + 'COALESCE': tokens.Keyword, 'COBOL': tokens.Keyword, 'COLLATE': tokens.Keyword, 'COLLATION': tokens.Keyword, @@ -530,6 +530,7 @@ KEYWORDS_COMMON = { 'DELETE': tokens.Keyword.DML, 'UPDATE': tokens.Keyword.DML, 'REPLACE': tokens.Keyword.DML, + 'MERGE': tokens.Keyword.DML, 'DROP': tokens.Keyword.DDL, 'CREATE': tokens.Keyword.DDL, 'ALTER': tokens.Keyword.DDL, |