Support the "allowEmptyWhere" setting for select statements

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectSettings.java

@@ -1,9 +1,18 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 public class SelectSettings extends Settings {
+  private boolean allowEmptyWhere = true;
   private int fetchSize = 0;
   private int maxRows = 0;
 
+  public boolean getAllowEmptyWhere() {
+    return allowEmptyWhere;
+  }
+
+  public void setAllowEmptyWhere(boolean allowEmptyWhere) {
+    this.allowEmptyWhere = allowEmptyWhere;
+  }
+
   public int getFetchSize() {
     return fetchSize;
   }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/UpdateSettings.java

@@ -1,8 +1,8 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 public class UpdateSettings extends Settings {
-  int batchSize = 0;
-  boolean allowEmptyWhere;
+  private int batchSize = 0;
+  private boolean allowEmptyWhere;
 
   public int getBatchSize() {
     return batchSize;

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

@@ -128,6 +128,16 @@ protected Command<List<ENTITY>> createCommand() {
     query.setFetchSize(settings.getFetchSize());
     query.setMaxRows(settings.getMaxRows());
     query.setQueryTimeout(settings.getQueryTimeout());
-    return new AssociateCommand<>(context, query);
+    return new AssociateCommand<ENTITY>(context, query) {
+      @Override
+      public List<ENTITY> execute() {
+        if (!settings.getAllowEmptyWhere()) {
+          if (context.where.isEmpty()) {
+            throw new EmptyWhereClauseException(sql);
+          }
+        }
+        return super.execute();
+      }
+    };
   }
 }

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

@@ -37,6 +37,16 @@ protected Command<RESULT> createCommand() {
     query.setFetchSize(settings.getQueryTimeout());
     query.setMaxRows(settings.getMaxRows());
     query.setQueryTimeout(settings.getQueryTimeout());
-    return new SelectCommand<>(query, resultSetHandler);
+    return new SelectCommand<RESULT>(query, resultSetHandler) {
+      @Override
+      public RESULT execute() {
+        if (!settings.getAllowEmptyWhere()) {
+          if (context.where.isEmpty()) {
+            throw new EmptyWhereClauseException(sql);
+          }
+        }
+        return super.execute();
+      }
+    };
   }
 }

test-criteria/src/test/java/example/EntityqlSelectTest.java

@@ -4,6 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Arrays;
@@ -16,6 +17,7 @@
 import org.seasar.doma.jdbc.SqlLogType;
 import org.seasar.doma.jdbc.criteria.Entityql;
 import org.seasar.doma.jdbc.criteria.option.AssociationOption;
+import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException;
 import org.seasar.doma.jdbc.criteria.statement.Listable;
 
 @ExtendWith(Env.class)
@@ -39,13 +41,23 @@ void settings() {
                   settings.setComment("all employees");
                   settings.setSqlLogType(SqlLogType.RAW);
                   settings.setQueryTimeout(1000);
+                  settings.setAllowEmptyWhere(true);
                   settings.setFetchSize(100);
                   settings.setMaxRows(100);
                 })
             .fetch();
     assertEquals(14, list.size());
   }
 
+  @Test
+  void allowEmptyWhere_disabled() {
+    Employee_ e = new Employee_();
+
+    assertThrows(
+        EmptyWhereClauseException.class,
+        () -> entityql.from(e, settings -> settings.setAllowEmptyWhere(false)).fetch());
+  }
+
   @Test
   void fetch() {
     Employee_ e = new Employee_();
@@ -262,9 +274,6 @@ void associate() {
 
   @Test
   void associate_dynamic() {
-    Employee_ e = new Employee_();
-    Department_ d = new Department_();
-
     List<Employee> list = associate_dynamic(true);
     assertEquals(14, list.size());
     assertTrue(list.stream().allMatch(emp -> emp.getDepartment() != null));

test-criteria/src/test/java/example/NativeSqlSelectTest.java

@@ -6,6 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.seasar.doma.jdbc.criteria.AggregateFunctions.count;
 import static org.seasar.doma.jdbc.criteria.AggregateFunctions.min;
@@ -18,8 +19,10 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.seasar.doma.jdbc.Config;
+import org.seasar.doma.jdbc.SqlLogType;
 import org.seasar.doma.jdbc.criteria.NativeSql;
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
+import org.seasar.doma.jdbc.criteria.statement.EmptyWhereClauseException;
 import org.seasar.doma.jdbc.criteria.tuple.Row;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
@@ -32,6 +35,35 @@ public NativeSqlSelectTest(Config config) {
     this.nativeSql = new NativeSql(config);
   }
 
+  @Test
+  void settings() {
+    Employee_ e = new Employee_();
+
+    List<Employee> list =
+        nativeSql
+            .from(
+                e,
+                settings -> {
+                  settings.setComment("all employees");
+                  settings.setSqlLogType(SqlLogType.RAW);
+                  settings.setQueryTimeout(1000);
+                  settings.setAllowEmptyWhere(true);
+                  settings.setFetchSize(100);
+                  settings.setMaxRows(100);
+                })
+            .fetch();
+    assertEquals(14, list.size());
+  }
+
+  @Test
+  void fetch_allowEmptyWhere_disabled() {
+    Employee_ e = new Employee_();
+
+    assertThrows(
+        EmptyWhereClauseException.class,
+        () -> nativeSql.from(e, settings -> settings.setAllowEmptyWhere(false)).fetch());
+  }
+
   @Test
   void from() {
     Employee_ e = new Employee_();