diff --git a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java index 51e0f35625..163b2e9af3 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Keywords.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Keywords.java @@ -34,6 +34,7 @@ public class Keywords { public final static Keywords DEFAULT_KEYWORDS; public final static Keywords SQLITE_KEYWORDS; + public final static Keywords DM_KEYWORDS; static { Map map = new HashMap(); @@ -163,12 +164,25 @@ public class Keywords { DEFAULT_KEYWORDS = new Keywords(map); - Map sqlitemap = new HashMap(); + { + Map sqlitemap = new HashMap(); - sqlitemap.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); + sqlitemap.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); - sqlitemap.put("LIMIT", Token.LIMIT); - SQLITE_KEYWORDS = new Keywords(sqlitemap); + sqlitemap.put("LIMIT", Token.LIMIT); + SQLITE_KEYWORDS = new Keywords(sqlitemap); + } + + { + Map sqlitemap = new HashMap(); + + sqlitemap.putAll(Keywords.DEFAULT_KEYWORDS.getKeywords()); + + sqlitemap.put("MERGE", Token.MERGE); + sqlitemap.put("MATCHED", Token.MATCHED); + sqlitemap.put("USING", Token.USING); + DM_KEYWORDS = new Keywords(sqlitemap); + } } public boolean containsValue(Token token) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java index 1c65beabf9..792d9b2250 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Lexer.java @@ -132,6 +132,8 @@ public class Lexer { if (DbType.sqlite == dbType) { this.keywods = Keywords.SQLITE_KEYWORDS; + } else if (DbType.dm == dbType) { + this.keywods = Keywords.DM_KEYWORDS; } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java new file mode 100644 index 0000000000..cbff12b77c --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/dm/DM_MergeTest_0.java @@ -0,0 +1,33 @@ +package com.alibaba.druid.bvt.sql.dm; + +import com.alibaba.druid.DbType; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.ast.statement.SQLMergeStatement; +import junit.framework.TestCase; + +import java.util.List; + +public class DM_MergeTest_0 extends TestCase { + public void test_0() throws Exception { + String sql = "MERGE INTO sys_user_online a using (select count(1) co from sys_user_online " + + "where sessionid = ?) b on (b.co <> 0) when matched then update set login_name = ?, dept_name = ?, ipaddr = ?, login_location = ?, browser = ?, os = ?, status = ?, start_timestamp = ?, last_access_time = ?, expire_time = ? where sessionid = ? when not matched then insert(SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR,LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; +// + List statementList = SQLUtils.parseStatements(sql, DbType.dm); + SQLMergeStatement stmt = (SQLMergeStatement)statementList.get(0); + + assertEquals(1, statementList.size()); + + assertEquals("MERGE INTO sys_user_online a\n" + + "USING (\n" + + "\tSELECT count(1) AS co\n" + + "\tFROM sys_user_online\n" + + "\tWHERE sessionid = ?\n" + + ") b ON (b.co <> 0) \n" + + "WHEN MATCHED THEN UPDATE SET login_name = ?, dept_name = ?, ipaddr = ?, login_location = ?, browser = ?, os = ?, status = ?, start_timestamp = ?, last_access_time = ?, expire_time = ?\n" + + "\tWHERE sessionid = ?\n" + + "WHEN NOT MATCHED THEN INSERT (SESSIONID, LOGIN_NAME, DEPT_NAME, IPADDR, LOGIN_LOCATION, BROWSER, OS, STATUS, START_TIMESTAMP, LAST_ACCESS_TIME, EXPIRE_TIME) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", stmt.toString()); + + + } +}