Merge pull request #416 from domaframework/distinct

nakamura-to · web-flow · commit cd77a14725ae · 2020-05-09T19:06:17.000+09:00
Support the distinct keyword
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/AssociationKind.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/AssociationKind.java
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Criterion.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/Criterion.java
@@ -2,7 +2,7 @@
 
 import java.util.Collections;
 import java.util.List;
-import org.seasar.doma.jdbc.criteria.LikeOption;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public interface Criterion {
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/ForUpdate.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/ForUpdate.java
@@ -1,10 +1,10 @@
 package org.seasar.doma.jdbc.criteria.context;
 
 import java.util.Objects;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 
 public class ForUpdate {
-  public ForUpdateOption option;
+  public final ForUpdateOption option;
 
   public ForUpdate(ForUpdateOption option) {
     Objects.requireNonNull(option);
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/context/SelectContext.java
@@ -12,19 +12,21 @@
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 
 public class SelectContext implements Context {
   public final EntityDef<?> entityDef;
   public Projection projection;
-  public boolean distinct;
+  public DistinctOption distinct = DistinctOption.DISABLED;
   public final List<Join> joins = new ArrayList<>();
   public List<Criterion> where = new ArrayList<>();
   public final List<PropertyDef<?>> groupBy = new ArrayList<>();
   public List<Criterion> having = new ArrayList<>();
   public final List<Pair<OrderByItem, String>> orderBy = new ArrayList<>();
   public Integer limit;
   public Integer offset;
-  public ForUpdate forUpdate;
+  public ForUpdate forUpdate = new ForUpdate(ForUpdateOption.DISABLED);
   public final Map<Pair<EntityDef<?>, EntityDef<?>>, BiConsumer<Object, Object>> associations =
       new LinkedHashMap<>();
   public final SelectSettings options = new SelectSettings();
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SelectFromDeclaration.java
@@ -6,15 +6,16 @@
 import java.util.function.Consumer;
 import org.seasar.doma.DomaException;
 import org.seasar.doma.internal.util.Pair;
-import org.seasar.doma.jdbc.criteria.AssociationKind;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.context.ForUpdate;
 import org.seasar.doma.jdbc.criteria.context.Join;
 import org.seasar.doma.jdbc.criteria.context.JoinKind;
 import org.seasar.doma.jdbc.criteria.context.Projection;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.AssociationOption;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 import org.seasar.doma.message.Message;
 
 public class SelectFromDeclaration {
@@ -30,6 +31,10 @@ public SelectContext getContext() {
     return context;
   }
 
+  public void distinct(DistinctOption distinctOption) {
+    context.distinct = distinctOption;
+  }
+
   public void innerJoin(EntityDef<?> entityDef, Consumer<JoinDeclaration> block) {
     Objects.requireNonNull(entityDef);
     Objects.requireNonNull(block);
@@ -97,19 +102,19 @@ public <ENTITY1, ENTITY2> void associate(
       EntityDef<ENTITY1> first,
       EntityDef<ENTITY2> second,
       BiConsumer<ENTITY1, ENTITY2> associator,
-      AssociationKind kind) {
+      AssociationOption kind) {
     Objects.requireNonNull(first);
     Objects.requireNonNull(second);
     Objects.requireNonNull(associator);
     Objects.requireNonNull(kind);
     if (!context.getEntityDefs().contains(first)) {
-      if (kind == AssociationKind.MANDATORY) {
+      if (kind == AssociationOption.MANDATORY) {
         throw new DomaException(Message.DOMA6001, "first");
       }
       return;
     }
     if (!context.getEntityDefs().contains(second)) {
-      if (kind == AssociationKind.MANDATORY) {
+      if (kind == AssociationOption.MANDATORY) {
         throw new DomaException(Message.DOMA6001, "second");
       }
       return;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java
@@ -6,13 +6,13 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import org.seasar.doma.jdbc.criteria.LikeOption;
 import org.seasar.doma.jdbc.criteria.context.Context;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.Operand;
 import org.seasar.doma.jdbc.criteria.context.SubSelectContext;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
 public class WhereDeclaration extends ComparisonDeclaration<Context> {
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/AssociationOption.java
@@ -0,0 +1,6 @@
+package org.seasar.doma.jdbc.criteria.option;
+
+public enum AssociationOption {
+  MANDATORY,
+  OPTIONAL
+}
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/DistinctOption.java
@@ -0,0 +1,6 @@
+package org.seasar.doma.jdbc.criteria.option;
+
+public enum DistinctOption {
+  ENABLED,
+  DISABLED
+}
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/ForUpdateOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/ForUpdateOption.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.jdbc.criteria;
+package org.seasar.doma.jdbc.criteria.option;
 
 public enum ForUpdateOption {
   WAIT,
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/LikeOption.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/option/LikeOption.java
@@ -1,4 +1,4 @@
-package org.seasar.doma.jdbc.criteria;
+package org.seasar.doma.jdbc.criteria.option;
 
 public enum LikeOption {
   NONE,
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/BuilderSupport.java
@@ -11,13 +11,13 @@
 import org.seasar.doma.internal.jdbc.sql.PreparedSqlBuilder;
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.InParameter;
-import org.seasar.doma.jdbc.criteria.LikeOption;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.Operand;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.declaration.AggregateFunction;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/query/SelectBuilder.java
@@ -11,7 +11,6 @@
 import org.seasar.doma.jdbc.PreparedSql;
 import org.seasar.doma.jdbc.SqlKind;
 import org.seasar.doma.jdbc.SqlLogType;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.context.Criterion;
 import org.seasar.doma.jdbc.criteria.context.Join;
 import org.seasar.doma.jdbc.criteria.context.JoinKind;
@@ -20,6 +19,8 @@
 import org.seasar.doma.jdbc.criteria.declaration.AggregateFunction;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 
 public class SelectBuilder {
   private final SelectContext context;
@@ -77,7 +78,7 @@ void interpret() {
   private void select() {
     buf.appendSql("select ");
 
-    if (context.distinct) {
+    if (context.distinct == DistinctOption.ENABLED) {
       buf.appendSql("distinct ");
     }
 
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStatement.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/EntityqlSelectStatement.java
@@ -7,8 +7,6 @@
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.PreparedSql;
 import org.seasar.doma.jdbc.command.Command;
-import org.seasar.doma.jdbc.criteria.AssociationKind;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.command.AssociateCommand;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.context.SelectSettings;
@@ -17,6 +15,9 @@
 import org.seasar.doma.jdbc.criteria.declaration.SelectFromDeclaration;
 import org.seasar.doma.jdbc.criteria.declaration.WhereDeclaration;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
+import org.seasar.doma.jdbc.criteria.option.AssociationOption;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.query.CriteriaQuery;
 import org.seasar.doma.jdbc.criteria.query.SelectBuilder;
 
@@ -31,6 +32,16 @@ public EntityqlSelectStatement(Config config, SelectFromDeclaration declaration)
     this.declaration = Objects.requireNonNull(declaration);
   }
 
+  public EntityqlSelectStatement<ENTITY> distinct() {
+    declaration.distinct(DistinctOption.ENABLED);
+    return this;
+  }
+
+  public EntityqlSelectStatement<ENTITY> distinct(DistinctOption distinctOption) {
+    declaration.distinct(distinctOption);
+    return this;
+  }
+
   public EntityqlSelectStatement<ENTITY> innerJoin(
       EntityDef<?> entityDef, Consumer<JoinDeclaration> block) {
     declaration.innerJoin(entityDef, block);
@@ -47,15 +58,15 @@ public <ENTITY1, ENTITY2> EntityqlSelectStatement<ENTITY> associate(
       EntityDef<ENTITY1> first,
       EntityDef<ENTITY2> second,
       BiConsumer<ENTITY1, ENTITY2> associator) {
-    declaration.associate(first, second, associator, AssociationKind.MANDATORY);
+    declaration.associate(first, second, associator, AssociationOption.MANDATORY);
     return this;
   }
 
   public <ENTITY1, ENTITY2> EntityqlSelectStatement<ENTITY> associate(
       EntityDef<ENTITY1> first,
       EntityDef<ENTITY2> second,
       BiConsumer<ENTITY1, ENTITY2> associator,
-      AssociationKind kind) {
+      AssociationOption kind) {
     declaration.associate(first, second, associator, kind);
     return this;
   }
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectStarting.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/statement/NativeSqlSelectStarting.java
@@ -12,7 +12,6 @@
 import org.seasar.doma.jdbc.Config;
 import org.seasar.doma.jdbc.ObjectProvider;
 import org.seasar.doma.jdbc.command.Command;
-import org.seasar.doma.jdbc.criteria.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.command.MappedResultProvider;
 import org.seasar.doma.jdbc.criteria.context.SelectContext;
 import org.seasar.doma.jdbc.criteria.context.SetOperationContext;
@@ -23,6 +22,8 @@
 import org.seasar.doma.jdbc.criteria.declaration.WhereDeclaration;
 import org.seasar.doma.jdbc.criteria.def.EntityDef;
 import org.seasar.doma.jdbc.criteria.def.PropertyDef;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple3;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple4;
@@ -49,6 +50,16 @@ public NativeSqlSelectStarting(
     this.entityDef = Objects.requireNonNull(entityDef);
   }
 
+  public NativeSqlSelectStarting<ENTITY> distinct() {
+    declaration.distinct(DistinctOption.ENABLED);
+    return this;
+  }
+
+  public NativeSqlSelectStarting<ENTITY> distinct(DistinctOption distinctOption) {
+    declaration.distinct(distinctOption);
+    return this;
+  }
+
   public NativeSqlSelectStarting<ENTITY> innerJoin(
       EntityDef<?> entityDef, Consumer<JoinDeclaration> block) {
     Objects.requireNonNull(entityDef);
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/EntityqlSelectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/EntityqlSelectTest.java
@@ -11,6 +11,8 @@
 import org.seasar.doma.jdbc.criteria.entity.Dept_;
 import org.seasar.doma.jdbc.criteria.entity.Emp;
 import org.seasar.doma.jdbc.criteria.entity.Emp_;
+import org.seasar.doma.jdbc.criteria.option.AssociationOption;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
 import org.seasar.doma.jdbc.criteria.statement.Statement;
 import org.seasar.doma.message.Message;
 
@@ -115,7 +117,7 @@ void associate_optional() {
         entityql
             .from(e)
             .innerJoin(d, on -> {})
-            .associate(e, d, (emp, dept) -> {}, AssociationKind.OPTIONAL);
+            .associate(e, d, (emp, dept) -> {}, AssociationOption.OPTIONAL);
 
     Sql<?> sql = stmt.asSql();
     assertEquals(
@@ -193,4 +195,36 @@ void offset_null() {
     assertEquals(
         "select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_", sql.getFormattedSql());
   }
+
+  @Test
+  void distinct() {
+    Emp_ e = new Emp_();
+    Statement<List<Emp>> stmt = entityql.from(e).distinct();
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select distinct t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_",
+        sql.getFormattedSql());
+  }
+
+  @Test
+  void distinct_enabled() {
+    Emp_ e = new Emp_();
+    Statement<List<Emp>> stmt = entityql.from(e).distinct(DistinctOption.ENABLED);
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select distinct t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_",
+        sql.getFormattedSql());
+  }
+
+  @Test
+  void distinct_disabled() {
+    Emp_ e = new Emp_();
+    Statement<List<Emp>> stmt = entityql.from(e).distinct(DistinctOption.DISABLED);
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_", sql.getFormattedSql());
+  }
 }
diff --git a/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java b/doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java
@@ -20,6 +20,9 @@
 import org.seasar.doma.jdbc.criteria.entity.Emp;
 import org.seasar.doma.jdbc.criteria.entity.Emp_;
 import org.seasar.doma.jdbc.criteria.entity.NoIdEmp_;
+import org.seasar.doma.jdbc.criteria.option.DistinctOption;
+import org.seasar.doma.jdbc.criteria.option.ForUpdateOption;
+import org.seasar.doma.jdbc.criteria.option.LikeOption;
 import org.seasar.doma.jdbc.criteria.statement.Buildable;
 import org.seasar.doma.jdbc.criteria.statement.SetOperand;
 import org.seasar.doma.jdbc.criteria.statement.Statement;
@@ -892,4 +895,36 @@ void peek() {
             .union(nativeSql.from(d).select(d.name).peek(System.out::println))
             .peek(System.out::println);
   }
+
+  @Test
+  void distinct() {
+    Emp_ e = new Emp_();
+    Buildable<?> stmt = nativeSql.from(e).distinct().where(c -> c.eq(e.name, "a"));
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select distinct t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_ where t0_.NAME = 'a'",
+        sql.getFormattedSql());
+  }
+
+  @Test
+  void distinct_enabled() {
+    Emp_ e = new Emp_();
+    Buildable<?> stmt =
+        nativeSql.from(e).distinct(DistinctOption.ENABLED).where(c -> c.eq(e.name, "a"));
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select distinct t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_ where t0_.NAME = 'a'",
+        sql.getFormattedSql());
+  }
+
+  @Test
+  void distinct_disabled() {
+    Emp_ e = new Emp_();
+    Buildable<?> stmt =
+        nativeSql.from(e).distinct(DistinctOption.DISABLED).where(c -> c.eq(e.name, "a"));
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_ where t0_.NAME = 'a'",
+        sql.getFormattedSql());
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.seasar.doma.jdbc.criteria;`
	`1`	`+package org.seasar.doma.jdbc.criteria.option;`
`2`	`2`
`3`	`3`	`public enum ForUpdateOption {`
`4`	`4`	`WAIT,`