Provide default results on execution skip

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/CommandImplementors.java

@@ -17,6 +17,7 @@
 
 import java.lang.reflect.Method;
 import java.util.function.BiFunction;
+import java.util.function.Supplier;
 import org.seasar.doma.jdbc.aggregate.AggregateCommand;
 import org.seasar.doma.jdbc.aggregate.AggregateStrategyType;
 import org.seasar.doma.jdbc.aggregate.StreamReducer;
@@ -112,8 +113,11 @@ default UpdateCommand createUpdateCommand(Method method, UpdateQuery query) {
 
   // TODO
   default <RESULT> DeleteReturningCommand<RESULT> createDeleteReturningCommand(
-      Method method, DeleteQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    return new DeleteReturningCommand<>(query, resultSetHandler);
+      Method method,
+      DeleteQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    return new DeleteReturningCommand<>(query, resultSetHandler, emptyResultSupplier);
   }
 
   /**
@@ -125,14 +129,20 @@ default <RESULT> DeleteReturningCommand<RESULT> createDeleteReturningCommand(
    * @return the command
    */
   default <RESULT> InsertReturningCommand<RESULT> createInsertReturningCommand(
-      Method method, InsertQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    return new InsertReturningCommand<>(query, resultSetHandler);
+      Method method,
+      InsertQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    return new InsertReturningCommand<>(query, resultSetHandler, emptyResultSupplier);
   }
 
   // TODO
   default <RESULT> UpdateReturningCommand<RESULT> createUpdateReturningCommand(
-      Method method, UpdateQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    return new UpdateReturningCommand<>(query, resultSetHandler);
+      Method method,
+      UpdateQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    return new UpdateReturningCommand<>(query, resultSetHandler, emptyResultSupplier);
   }
 
   /**

doma-core/src/main/java/org/seasar/doma/jdbc/command/DeleteReturningCommand.java

@@ -17,13 +17,17 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.function.Supplier;
 import org.seasar.doma.jdbc.query.DeleteQuery;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
 
 public class DeleteReturningCommand<RESULT> extends ModifyReturningCommand<DeleteQuery, RESULT> {
 
-  public DeleteReturningCommand(DeleteQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    super(query, resultSetHandler);
+  public DeleteReturningCommand(
+      DeleteQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    super(query, resultSetHandler, emptyResultSupplier);
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/jdbc/command/InsertReturningCommand.java

@@ -17,13 +17,17 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.function.Supplier;
 import org.seasar.doma.jdbc.query.InsertQuery;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
 
 public class InsertReturningCommand<RESULT> extends ModifyReturningCommand<InsertQuery, RESULT> {
 
-  public InsertReturningCommand(InsertQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    super(query, resultSetHandler);
+  public InsertReturningCommand(
+      InsertQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    super(query, resultSetHandler, emptyResultSupplier);
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/jdbc/command/ModifyReturningCommand.java

@@ -46,11 +46,17 @@ public abstract class ModifyReturningCommand<QUERY extends ModifyQuery, RESULT>
 
   protected final ResultSetHandler<RESULT> resultSetHandler;
 
-  protected ModifyReturningCommand(QUERY query, ResultSetHandler<RESULT> resultSetHandler) {
-    assertNotNull(query, resultSetHandler);
+  protected final Supplier<RESULT> emptyResultSupplier;
+
+  protected ModifyReturningCommand(
+      QUERY query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    assertNotNull(query, resultSetHandler, emptyResultSupplier);
     this.query = query;
     this.sql = query.getSql();
     this.resultSetHandler = resultSetHandler;
+    this.emptyResultSupplier = emptyResultSupplier;
   }
 
   @Override
@@ -64,8 +70,7 @@ public RESULT execute() {
       JdbcLogger logger = query.getConfig().getJdbcLogger();
       logger.logSqlExecutionSkipping(
           query.getClassName(), query.getMethodName(), query.getSqlExecutionSkipCause());
-      // TODO
-      return null;
+      return emptyResultSupplier.get();
     }
     Connection connection = JdbcUtil.getConnection(query.getConfig().getDataSource());
     try {

doma-core/src/main/java/org/seasar/doma/jdbc/command/UpdateReturningCommand.java

@@ -17,13 +17,17 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.function.Supplier;
 import org.seasar.doma.jdbc.query.UpdateQuery;
 import org.seasar.doma.jdbc.statistic.StatisticManager;
 
 public class UpdateReturningCommand<RESULT> extends ModifyReturningCommand<UpdateQuery, RESULT> {
 
-  public UpdateReturningCommand(UpdateQuery query, ResultSetHandler<RESULT> resultSetHandler) {
-    super(query, resultSetHandler);
+  public UpdateReturningCommand(
+      UpdateQuery query,
+      ResultSetHandler<RESULT> resultSetHandler,
+      Supplier<RESULT> emptyResultSupplier) {
+    super(query, resultSetHandler, emptyResultSupplier);
   }
 
   @Override

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlDeleteStatement.java

@@ -107,7 +107,7 @@ private Command<Result<ENTITY>> createReturningCommand(
         config
             .getCommandImplementors()
             .createDeleteReturningCommand(
-                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType));
+                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType), () -> null);
     return new Command<>() {
       @Override
       public Query getQuery() {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlInsertTerminal.java

@@ -122,7 +122,7 @@ private Command<Result<ENTITY>> createReturningCommand(
         config
             .getCommandImplementors()
             .createInsertReturningCommand(
-                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType));
+                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType), () -> null);
     return new Command<>() {
       @Override
       public Query getQuery() {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlMultiInsertTerminal.java

@@ -17,6 +17,7 @@
 
 import static org.seasar.doma.jdbc.criteria.statement.EntityqlMultiInsertStatement.EMPTY_SQL;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import org.seasar.doma.internal.jdbc.command.EntityResultListHandler;
@@ -123,7 +124,10 @@ private Command<MultiResult<ENTITY>> createReturningCommand(
         config
             .getCommandImplementors()
             .createInsertReturningCommand(
-                EXECUTE_METHOD, query, new EntityResultListHandler<>(entityType));
+                EXECUTE_METHOD,
+                query,
+                new EntityResultListHandler<>(entityType),
+                Collections::emptyList);
     return new Command<>() {
       @Override
       public Query getQuery() {

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlUpdateStatement.java

@@ -115,7 +115,7 @@ private Command<Result<ENTITY>> createReturningCommand(
         config
             .getCommandImplementors()
             .createUpdateReturningCommand(
-                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType));
+                EXECUTE_METHOD, query, new EntitySingleResultHandler<>(entityType), () -> null);
     return new Command<>() {
       @Override
       public Query getQuery() {

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

@@ -338,6 +338,16 @@ void returning() {
     assertEquals(1, entity2.getVersion());
   }
 
+  @Test
+  void returning_skip() {
+    Department_ d = new Department_();
+
+    MultiResult<Department> result =
+        dsl.insert(d).multi(Collections.emptyList()).returning().execute();
+    assertTrue(result.getEntities().isEmpty());
+    assertEquals(0, result.getCount());
+  }
+
   @Test
   @Run(unless = {Dbms.MYSQL, Dbms.MYSQL8, Dbms.ORACLE})
   void returning_ignore() {