Fix SqlServer split merge sql will miss ; (apache#16118)

zhuxt2015 · Jun 6, 2024 · d6714bb · d6714bb
1 parent 5e4afe6
commit d6714bb
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/...ache/dolphinscheduler/plugin/datasource/sqlserver/param/SQLServerDataSourceProcessor.java b/...ache/dolphinscheduler/plugin/datasource/sqlserver/param/SQLServerDataSourceProcessor.java
@@ -35,6 +35,7 @@
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.alibaba.druid.sql.parser.SQLParserUtils;
 import com.google.auto.service.AutoService;
@@ -128,8 +129,10 @@ public DataSourceProcessor create() {
 
     @Override
     public List<String> splitAndRemoveComment(String sql) {
-        String cleanSQL = SQLParserUtils.removeComment(sql, com.alibaba.druid.DbType.sqlserver);
-        return SQLParserUtils.split(cleanSQL, com.alibaba.druid.DbType.sqlserver);
+        return SQLParserUtils.splitAndRemoveComment(sql, com.alibaba.druid.DbType.sqlserver)
+                .stream()
+                .map(subSql -> subSql.concat(";"))
+                .collect(Collectors.toList());
     }
 
     private String transformOther(Map<String, String> otherMap) {

diff --git a/.../dolphinscheduler/plugin/datasource/sqlserver/param/SQLServerDataSourceProcessorTest.java b/.../dolphinscheduler/plugin/datasource/sqlserver/param/SQLServerDataSourceProcessorTest.java
@@ -17,12 +17,15 @@
 
 package org.apache.dolphinscheduler.plugin.datasource.sqlserver.param;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import org.apache.dolphinscheduler.common.constants.DataSourceConstants;
 import org.apache.dolphinscheduler.common.utils.JSONUtils;
 import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils;
 import org.apache.dolphinscheduler.spi.enums.DbType;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.Assertions;
@@ -95,4 +98,32 @@ public void testGetValidationQuery() {
         Assertions.assertEquals(DataSourceConstants.SQLSERVER_VALIDATION_QUERY,
                 sqlServerDatasourceProcessor.getValidationQuery());
     }
+
+    @Test
+    void splitAndRemoveComment_singleSelect() {
+        String sql = "select * from table;";
+        List<String> subSqls = sqlServerDatasourceProcessor.splitAndRemoveComment(sql);
+        assertThat(subSqls).hasSize(1);
+        assertThat(subSqls.get(0)).isEqualTo("select * from table;");
+    }
+
+    @Test
+    void splitAndRemoveComment_singleMerge() {
+        String sql = "MERGE\n" +
+                "    [ TOP ( expression ) [ PERCENT ] ]\n" +
+                "    [ INTO ] <target_table> [ WITH ( <merge_hint> ) ] [ [ AS ] table_alias ]\n" +
+                "    USING <table_source> [ [ AS ] table_alias ]\n" +
+                "    ON <merge_search_condition>\n" +
+                "    [ WHEN MATCHED [ AND <clause_search_condition> ]\n" +
+                "        THEN <merge_matched> ] [ ...n ]\n" +
+                "    [ WHEN NOT MATCHED [ BY TARGET ] [ AND <clause_search_condition> ]\n" +
+                "        THEN <merge_not_matched> ]\n" +
+                "    [ WHEN NOT MATCHED BY SOURCE [ AND <clause_search_condition> ]\n" +
+                "        THEN <merge_matched> ] [ ...n ]\n" +
+                "    [ <output_clause> ]\n" +
+                "    [ OPTION ( <query_hint> [ ,...n ] ) ];";
+        List<String> subSqls = sqlServerDatasourceProcessor.splitAndRemoveComment(sql);
+        assertThat(subSqls).hasSize(1);
+        assertThat(subSqls.get(0)).isEqualTo(sql);
+    }
 }