Fix MssqlUpsertAssembler and HsqldbUpsertAssembler

momosetkn · momosetkn · commit 74039ea03bbf · 2024-03-17T23:42:40.000+09:00
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbUpsertAssembler.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/HsqldbUpsertAssembler.java
@@ -70,6 +70,7 @@ public void assemble() {
       }
       buf.cutBackSql(2);
     }
+    buf.appendSql(";");
   }
 
   private void excludeQuery() {
@@ -79,11 +80,11 @@ private void excludeQuery() {
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(") as ");
+    buf.appendSql(")) as ");
     excludeAlias();
     buf.appendSql(" (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
-      buf.appendParameter(insertValue.component2());
+      column(insertValue.component1());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlUpsertAssembler.java b/doma-core/src/main/java/org/seasar/doma/jdbc/dialect/MssqlUpsertAssembler.java
@@ -69,6 +69,7 @@ public void assemble() {
       }
       buf.cutBackSql(2);
     }
+    buf.appendSql(";");
   }
 
   private void excludeQuery() {
@@ -78,11 +79,11 @@ private void excludeQuery() {
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(") as ");
+    buf.appendSql(")) as ");
     excludeAlias();
     buf.appendSql(" (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
-      buf.appendParameter(insertValue.component2());
+      column(insertValue.component1());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ public void assemble() {`
`70`	`70`	`}`
`71`	`71`	`buf.cutBackSql(2);`
`72`	`72`	`}`
	`73`	`+ buf.appendSql(";");`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`private void excludeQuery() {`
`@@ -79,11 +80,11 @@ private void excludeQuery() {`
`79`	`80`	`buf.appendSql(", ");`
`80`	`81`	`}`
`81`	`82`	`buf.cutBackSql(2);`
`82`		`- buf.appendSql(") as ");`
	`83`	`+ buf.appendSql(")) as ");`
`83`	`84`	`excludeAlias();`
`84`	`85`	`buf.appendSql(" (");`
`85`	`86`	`for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {`
`86`		`- buf.appendParameter(insertValue.component2());`
	`87`	`+ column(insertValue.component1());`
`87`	`88`	`buf.appendSql(", ");`
`88`	`89`	`}`
`89`	`90`	`buf.cutBackSql(2);`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public void assemble() {`
`69`	`69`	`}`
`70`	`70`	`buf.cutBackSql(2);`
`71`	`71`	`}`
	`72`	`+ buf.appendSql(";");`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`private void excludeQuery() {`
`@@ -78,11 +79,11 @@ private void excludeQuery() {`
`78`	`79`	`buf.appendSql(", ");`
`79`	`80`	`}`
`80`	`81`	`buf.cutBackSql(2);`
`81`		`- buf.appendSql(") as ");`
	`82`	`+ buf.appendSql(")) as ");`
`82`	`83`	`excludeAlias();`
`83`	`84`	`buf.appendSql(" (");`
`84`	`85`	`for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {`
`85`		`- buf.appendParameter(insertValue.component2());`
	`86`	`+ column(insertValue.component1());`
`86`	`87`	`buf.appendSql(", ");`
`87`	`88`	`}`
`88`	`89`	`buf.cutBackSql(2);`