Merge pull request #100 from qrollin/feature/fix_merge_into

fix empty "WHEN MATCHED THEN UPDATE SET" clause on "MERGE INTO"
osalvador · Sep 20, 2022 · 151a80e · 151a80e
2 parents 6c62099 + f747059
commit 151a80e
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/src/main/java/org/replicadb/manager/SQLServerManager.java b/src/main/java/org/replicadb/manager/SQLServerManager.java
@@ -13,6 +13,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
+import java.util.stream.Collectors;
 
 public class SQLServerManager extends SqlManager {
 
@@ -165,19 +166,24 @@ protected void mergeStagingTable () throws SQLException {
          sql.append("src.").append(pks[i]).append("= trg.").append(pks[i]);
       }
 
-      sql.append(" ) WHEN MATCHED THEN UPDATE SET ");
-      LOG.trace("allColls: {} \n pks: {}", allColls, pks);
-      // Set all columns for UPDATE SET statement
-      for (String colName : allColls.split("\\s*,\\s*")) {
-         LOG.trace("colName: {}", colName);
-         boolean contains = Arrays.asList(pks).contains(colName);
-         boolean containsQuoted = Arrays.asList(pks).contains("\"" + colName + "\"");
-         if (!contains && !containsQuoted)
-            sql.append(" trg.").append(colName).append(" = src.").append(colName).append(" ,");
+       sql.append(" ) ");
+       LOG.trace("allColls: {} \n pks: {}", allColls, pks);
+
+       // Set all columns for UPDATE SET statement
+       String allColSelect = Arrays.stream(allColls.split("\\s*,\\s*"))
+           .filter(colName -> {
+               boolean contains = Arrays.asList(pks).contains(colName);
+               boolean containsQuoted = Arrays.asList(pks).contains("\"" + colName + "\"");
+               return !contains && !containsQuoted;
+           }).map(colName -> {
+               LOG.debug("colName: {}", colName);
+               return String.format("trg.%s = src.%s", colName, colName);
+           }).collect(Collectors.joining(", "));
+
+      if (allColSelect.length() > 0) {
+         sql.append(" WHEN MATCHED THEN UPDATE SET ");
+         sql.append(allColSelect);
       }
-      // Delete the last comma
-      sql.setLength(sql.length() - 1);
-
 
       sql.append(" WHEN NOT MATCHED THEN INSERT ( ").append(allColls).
           append(" ) VALUES (");