Fix OracleUpsertAssembler and Db2UpsertAssembler

Author: momosetkn

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

@@ -39,17 +39,17 @@ public void assemble() {
     tableNameAndAlias(entityType);
     buf.appendSql(" using (");
     excludeQuery();
-    buf.appendSql(") as ");
+    buf.appendSql(") ");
     excludeAlias();
-    buf.appendSql(" on ");
+    buf.appendSql(" on (");
     for (EntityPropertyType<?, ?> key : keys) {
       targetColumn(key);
       buf.appendSql(" = ");
       assignmentColumn(key);
       buf.appendSql(" and ");
     }
     buf.cutBackSql(5);
-    buf.appendSql(" when not matched then insert (");
+    buf.appendSql(") when not matched then insert (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
       column(insertValue.component1());
       buf.appendSql(", ");
@@ -76,26 +76,20 @@ public void assemble() {
 
   private void excludeQuery() {
     buf.appendSql("select ");
-    for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
-      column(insertValue.component1());
-      buf.appendSql(", ");
-    }
-    buf.cutBackSql(2);
-    buf.appendSql(" from values (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
       buf.appendParameter(insertValue.component2());
       buf.appendSql(" as ");
       column(insertValue.component1());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(") as dual");
+    buf.appendSql(" from dual");
   }
 
   private void tableNameAndAlias(EntityType<?> entityType) {
     String sql =
         this.upsertAssemblerSupport.targetTable(
-            entityType, UpsertAssemblerSupport.TableNameType.NAME_AS_ALIAS);
+            entityType, UpsertAssemblerSupport.TableNameType.NAME_ALIAS);
     buf.appendSql(sql);
   }
 

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

@@ -38,17 +38,17 @@ public void assemble() {
     tableNameAndAlias(entityType);
     buf.appendSql(" using (");
     excludeQuery();
-    buf.appendSql(") as ");
+    buf.appendSql(") ");
     excludeAlias();
-    buf.appendSql(" on ");
+    buf.appendSql(" on (");
     for (EntityPropertyType<?, ?> key : keys) {
       targetColumn(key);
       buf.appendSql(" = ");
       assignmentColumn(key);
       buf.appendSql(" and ");
     }
     buf.cutBackSql(5);
-    buf.appendSql(" when not matched then insert (");
+    buf.appendSql(") when not matched then insert (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
       column(insertValue.component1());
       buf.appendSql(", ");
@@ -75,26 +75,20 @@ public void assemble() {
 
   private void excludeQuery() {
     buf.appendSql("select ");
-    for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
-      column(insertValue.component1());
-      buf.appendSql(", ");
-    }
-    buf.cutBackSql(2);
-    buf.appendSql(" from values (");
     for (Tuple2<EntityPropertyType<?, ?>, InParameter<?>> insertValue : insertValues) {
       buf.appendParameter(insertValue.component2());
       buf.appendSql(" as ");
       column(insertValue.component1());
       buf.appendSql(", ");
     }
     buf.cutBackSql(2);
-    buf.appendSql(") as dual");
+    buf.appendSql(" from dual");
   }
 
   private void tableNameAndAlias(EntityType<?> entityType) {
     String sql =
         this.upsertAssemblerSupport.targetTable(
-            entityType, UpsertAssemblerSupport.TableNameType.NAME_AS_ALIAS);
+            entityType, UpsertAssemblerSupport.TableNameType.NAME_ALIAS);
     buf.appendSql(sql);
   }