Support DuplicateKeyType for multi-row insert in H2 database

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/dialect/H2UpsertAssembler.java

@@ -7,6 +7,8 @@
 import org.seasar.doma.jdbc.query.DuplicateKeyType;
 import org.seasar.doma.jdbc.query.QueryOperand;
 import org.seasar.doma.jdbc.query.QueryOperandPair;
+import org.seasar.doma.jdbc.query.QueryOperandPairList;
+import org.seasar.doma.jdbc.query.QueryRows;
 import org.seasar.doma.jdbc.query.UpsertAssembler;
 import org.seasar.doma.jdbc.query.UpsertAssemblerContext;
 import org.seasar.doma.jdbc.query.UpsertAssemblerSupport;
@@ -23,7 +25,7 @@ public class H2UpsertAssembler implements UpsertAssembler {
 
   private final List<? extends EntityPropertyType<?, ?>> keys;
 
-  private final List<QueryOperandPair> insertValues;
+  private final QueryRows insertValues;
 
   private final List<QueryOperandPair> setValues;
 
@@ -34,12 +36,9 @@ public H2UpsertAssembler(UpsertAssemblerContext context) {
     this.entityType = context.entityType;
     this.duplicateKeyType = context.duplicateKeyType;
     this.keys = context.keys;
-    this.insertValues = context.insertValues.first().getPairs();
+    this.insertValues = context.insertValues;
     this.setValues = context.setValues.getPairs();
     this.upsertAssemblerSupport = new UpsertAssemblerSupport(context.naming, context.dialect);
-    if (context.insertValues.getRows().size() > 1) {
-      throw new UnsupportedOperationException();
-    }
   }
 
   @Override
@@ -59,13 +58,13 @@ public void assemble() {
     }
     buf.cutBackSql(5);
     buf.appendSql(" when not matched then insert (");
-    for (QueryOperandPair pair : insertValues) {
+    for (QueryOperandPair pair : insertValues.first().getPairs()) {
       column(pair.getLeft().getEntityPropertyType());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
     buf.appendSql(") values (");
-    for (QueryOperandPair pair : insertValues) {
+    for (QueryOperandPair pair : insertValues.first().getPairs()) {
       excludeColumn(pair.getLeft().getEntityPropertyType());
       buf.appendSql(", ");
     }
@@ -85,19 +84,24 @@ public void assemble() {
 
   private void excludeQuery() {
     buf.appendSql("select ");
-    for (QueryOperandPair pair : insertValues) {
+    for (QueryOperandPair pair : insertValues.first().getPairs()) {
       column(pair.getLeft().getEntityPropertyType());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(" from values (");
-    for (QueryOperandPair pair : insertValues) {
-      pair.getRight().accept(queryOperandVisitor);
-      buf.appendSql(", ");
+    buf.appendSql(" from values ");
+    for (QueryOperandPairList row : insertValues.getRows()) {
+      buf.appendSql("(");
+      for (QueryOperandPair pair : row.getPairs()) {
+        pair.getRight().accept(queryOperandVisitor);
+        buf.appendSql(", ");
+      }
+      buf.cutBackSql(2);
+      buf.appendSql("), ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(") as x (");
-    for (QueryOperandPair pair : insertValues) {
+    buf.appendSql(" as x (");
+    for (QueryOperandPair pair : insertValues.first().getPairs()) {
       column(pair.getLeft().getEntityPropertyType());
       buf.appendSql(", ");
     }

integration-test-java/src/test/java/org/seasar/doma/it/auto/AutoMultiInsertTest.java

@@ -414,7 +414,7 @@ public void whenListIsEmpty(Config config) throws Exception {
   }
 
   @Test
-  @Run(unless = {Dbms.H2, Dbms.SQLSERVER, Dbms.ORACLE})
+  @Run(unless = {Dbms.SQLSERVER, Dbms.ORACLE})
   public void insert_DuplicateKeyType_UPDATE(Config config) throws Exception {
     DeptDao dao = new DeptDaoImpl(config);
     Dept dept1 = new Dept(new Identity<>(5), 50, "PLANNING", new Location<>("TOKYO"), null);
@@ -456,7 +456,7 @@ public void insert_DuplicateKeyType_UPDATE(Config config) throws Exception {
   }
 
   @Test
-  @Run(unless = {Dbms.H2, Dbms.SQLSERVER, Dbms.ORACLE})
+  @Run(unless = {Dbms.SQLSERVER, Dbms.ORACLE})
   public void insert_DuplicateKeyType_IGNORE(Config config) throws Exception {
     DeptDao dao = new DeptDaoImpl(config);
     Dept dept1 = new Dept(new Identity<>(5), 50, "PLANNING", new Location<>("TOKYO"), null);
@@ -494,7 +494,7 @@ public void insert_DuplicateKeyType_IGNORE(Config config) throws Exception {
   }
 
   @Test
-  @Run(unless = {Dbms.H2, Dbms.SQLSERVER, Dbms.ORACLE})
+  @Run(unless = {Dbms.SQLSERVER, Dbms.ORACLE})
   public void insert_DuplicateKeyType_UPDATE_compositeKey(Config config) throws Exception {
     CompKeyDeptDao dao = new CompKeyDeptDaoImpl(config);
     CompKeyDept dept1 =
@@ -545,7 +545,7 @@ public void insert_DuplicateKeyType_UPDATE_compositeKey(Config config) throws Ex
   }
 
   @Test
-  @Run(unless = {Dbms.H2, Dbms.SQLSERVER, Dbms.ORACLE})
+  @Run(unless = {Dbms.SQLSERVER, Dbms.ORACLE})
   public void insert_DuplicateKeyType_IGNORE_compositeKey(Config config) throws Exception {
     CompKeyDeptDao dao = new CompKeyDeptDaoImpl(config);
     CompKeyDept dept1 =

integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlMultiInsertTest.java

@@ -65,7 +65,7 @@ void test() {
   }
 
   @Test
-  @Run(unless = {Dbms.ORACLE, Dbms.SQLSERVER, Dbms.H2})
+  @Run(unless = {Dbms.ORACLE, Dbms.SQLSERVER})
   void testIgnore() {
     Department_ d = new Department_();
 
@@ -112,7 +112,7 @@ void testIgnore() {
   }
 
   @Test
-  @Run(unless = {Dbms.ORACLE, Dbms.SQLSERVER, Dbms.H2})
+  @Run(unless = {Dbms.ORACLE, Dbms.SQLSERVER})
   void testUpdate() {
     Department_ d = new Department_();