From 930895f66400a03357942ec5baedeebcbe64defc Mon Sep 17 00:00:00 2001
From: Cristian Orellana <cristiano@groupon.com>
Date: Thu, 9 Jan 2014 16:07:02 -0800
Subject: Fix: fixed COALESCE keyword, it had a type. Add: Added MERGE keyword

---
 sqlparse/keywords.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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,
-- 
cgit v1.2.1