Merge pull request andialbrecht#123 from crorella/issue_122

andialbrecht · andialbrecht · commit 810b54692469 · 2014-01-09T20:17:42.000-08:00
Fix: fixed COALESCE keyword, it had a typo. Add: Added MERGE keyword
diff --git a/sqlparse/keywords.py b/sqlparse/keywords.py
@@ -61,7 +61,7 @@
     '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 @@
     '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,
