Merge pull request #435 from domaframework/optional-select-call

Make a select method call optional in a sub-select

Author: nakamura-to

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

@@ -1,11 +1,6 @@
 package org.seasar.doma.jdbc.criteria.context;
 
-import java.util.Objects;
+public interface SubSelectContext<RESULT> {
 
-public class SubSelectContext<RESULT> {
-  public final SelectContext context;
-
-  public SubSelectContext(SelectContext context) {
-    this.context = Objects.requireNonNull(context);
-  }
+  SelectContext get();
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/InsertDeclaration.java

@@ -27,6 +27,6 @@ public void values(Consumer<ValuesDeclaration> block) {
   public void select(Function<InsertSelectDeclaration, SubSelectContext<?>> block) {
     InsertSelectDeclaration declaration = new InsertSelectDeclaration();
     SubSelectContext<?> subSelectContext = block.apply(declaration);
-    context.selectContext = subSelectContext.context;
+    context.selectContext = subSelectContext.get();
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/InsertSelectDeclaration.java

@@ -4,7 +4,7 @@
 
 public class InsertSelectDeclaration {
 
-  public SubSelectFromDeclaration from(EntityMetamodel<?> entityMetamodel) {
-    return new SubSelectFromDeclaration(entityMetamodel);
+  public <ENTITY> SubSelectFromDeclaration<ENTITY> from(EntityMetamodel<ENTITY> entityMetamodel) {
+    return new SubSelectFromDeclaration<>(entityMetamodel);
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/SubSelectFromDeclaration.java

@@ -12,7 +12,7 @@
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 import org.seasar.doma.jdbc.criteria.tuple.Tuple2;
 
-public class SubSelectFromDeclaration {
+public class SubSelectFromDeclaration<ENTITY> implements SubSelectContext<ENTITY> {
 
   private final SelectFromDeclaration declaration;
 
@@ -22,51 +22,56 @@ public SubSelectFromDeclaration(EntityMetamodel<?> entityMetamodel) {
     this.declaration = new SelectFromDeclaration(context);
   }
 
-  public SubSelectFromDeclaration innerJoin(
+  @Override
+  public SelectContext get() {
+    return declaration.getContext();
+  }
+
+  public SubSelectFromDeclaration<ENTITY> innerJoin(
       EntityMetamodel<?> entityMetamodel, Consumer<JoinDeclaration> block) {
     declaration.innerJoin(entityMetamodel, block);
     return this;
   }
 
-  public SubSelectFromDeclaration leftJoin(
+  public SubSelectFromDeclaration<ENTITY> leftJoin(
       EntityMetamodel<?> entityMetamodel, Consumer<JoinDeclaration> block) {
     declaration.leftJoin(entityMetamodel, block);
     return this;
   }
 
-  public SubSelectFromDeclaration where(Consumer<WhereDeclaration> block) {
+  public SubSelectFromDeclaration<ENTITY> where(Consumer<WhereDeclaration> block) {
     declaration.where(block);
     return this;
   }
 
-  public SubSelectFromDeclaration orderBy(Consumer<OrderByNameDeclaration> block) {
+  public SubSelectFromDeclaration<ENTITY> orderBy(Consumer<OrderByNameDeclaration> block) {
     declaration.orderBy(block);
     return this;
   }
 
-  public <PROPERTY> SubSelectContext<PROPERTY> select() {
+  public SubSelectContext<ENTITY> select() {
     SelectContext context = declaration.getContext();
-    return new SubSelectContext<>(context);
+    return () -> context;
   }
 
-  public <PROPERTY> SubSelectContext<PROPERTY> select(EntityMetamodel<?> entityMetamodel) {
+  public SubSelectContext<ENTITY> select(EntityMetamodel<?> entityMetamodel) {
     SelectContext context = declaration.getContext();
     context.projection = new Projection.PropertyMetamodels(entityMetamodel.allPropertyMetamodels());
-    return new SubSelectContext<>(context);
+    return () -> context;
   }
 
   public <PROPERTY> SubSelectContext<PROPERTY> select(
       PropertyMetamodel<PROPERTY> propertyMetamodel) {
     SelectContext context = declaration.getContext();
     context.projection = new Projection.PropertyMetamodels(propertyMetamodel);
-    return new SubSelectContext<>(context);
+    return () -> context;
   }
 
   public <PROPERTY1, PROPERTY2> SubSelectContext<Tuple2<PROPERTY1, PROPERTY2>> select(
       PropertyMetamodel<PROPERTY1> first, PropertyMetamodel<PROPERTY2> second) {
     SelectContext context = declaration.getContext();
     context.projection = new Projection.PropertyMetamodels(first, second);
-    return new SubSelectContext<>(context);
+    return () -> context;
   }
 
   public SubSelectContext<List<?>> select(
@@ -79,6 +84,6 @@ public SubSelectContext<List<?>> select(
     list.add(propertyMetamodel2);
     list.addAll(Arrays.asList(propertyMetamodels));
     context.projection = new Projection.PropertyMetamodels(list);
-    return new SubSelectContext<>(context);
+    return () -> context;
   }
 }

doma-core/src/main/java/org/seasar/doma/jdbc/criteria/declaration/WhereDeclaration.java

@@ -98,13 +98,13 @@ public <PROPERTY> void notIn(PropertyMetamodel<PROPERTY> left, List<PROPERTY> ri
   public <PROPERTY> void in(PropertyMetamodel<PROPERTY> left, SubSelectContext<PROPERTY> right) {
     Objects.requireNonNull(left);
     Objects.requireNonNull(right);
-    add(new Criterion.InSubQuery(new Operand.Prop(left), right.context));
+    add(new Criterion.InSubQuery(new Operand.Prop(left), right.get()));
   }
 
   public <PROPERTY> void notIn(PropertyMetamodel<PROPERTY> left, SubSelectContext<PROPERTY> right) {
     Objects.requireNonNull(left);
     Objects.requireNonNull(right);
-    add(new Criterion.NotInSubQuery(new Operand.Prop(left), right.context));
+    add(new Criterion.NotInSubQuery(new Operand.Prop(left), right.get()));
   }
 
   public <PROPERTY1, PROPERTY2> void in(
@@ -148,7 +148,7 @@ public <PROPERTY1, PROPERTY2> void in(
     Objects.requireNonNull(right);
     Operand.Prop prop1 = new Operand.Prop(left.getItem1());
     Operand.Prop prop2 = new Operand.Prop(left.getItem2());
-    add(new Criterion.InTuple2SubQuery(new Tuple2<>(prop1, prop2), right.context));
+    add(new Criterion.InTuple2SubQuery(new Tuple2<>(prop1, prop2), right.get()));
   }
 
   public <PROPERTY1, PROPERTY2> void notIn(
@@ -158,20 +158,20 @@ public <PROPERTY1, PROPERTY2> void notIn(
     Objects.requireNonNull(right);
     Operand.Prop prop1 = new Operand.Prop(left.getItem1());
     Operand.Prop prop2 = new Operand.Prop(left.getItem2());
-    add(new Criterion.NotInTuple2SubQuery(new Tuple2<>(prop1, prop2), right.context));
+    add(new Criterion.NotInTuple2SubQuery(new Tuple2<>(prop1, prop2), right.get()));
   }
 
   public void exists(SubSelectContext<?> subSelectContext) {
     Objects.requireNonNull(subSelectContext);
-    add(new Criterion.Exists(subSelectContext.context));
+    add(new Criterion.Exists(subSelectContext.get()));
   }
 
   public void notExists(SubSelectContext<?> subSelectContext) {
     Objects.requireNonNull(subSelectContext);
-    add(new Criterion.NotExists(subSelectContext.context));
+    add(new Criterion.NotExists(subSelectContext.get()));
   }
 
-  public SubSelectFromDeclaration from(EntityMetamodel<?> entityMetamodel) {
-    return new SubSelectFromDeclaration(entityMetamodel);
+  public <ENTITY> SubSelectFromDeclaration<ENTITY> from(EntityMetamodel<ENTITY> entityMetamodel) {
+    return new SubSelectFromDeclaration<>(entityMetamodel);
   }
 }

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlInsertTest.java

@@ -5,6 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.seasar.doma.internal.jdbc.mock.MockConfig;
 import org.seasar.doma.jdbc.Sql;
+import org.seasar.doma.jdbc.criteria.entity.Dept_;
 import org.seasar.doma.jdbc.criteria.entity.Emp_;
 import org.seasar.doma.jdbc.criteria.statement.Statement;
 
@@ -43,6 +44,30 @@ void insert_select_entity() {
         sql.getFormattedSql());
   }
 
+  @Test
+  void insert_select_entity_without_select() {
+    Emp_ e = new Emp_();
+    Statement<Integer> stmt = nativeSql.insert(e).select(c -> c.from(e));
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "insert into EMP (ID, NAME, SALARY, VERSION) select t0_.ID, t0_.NAME, t0_.SALARY, t0_.VERSION from EMP t0_",
+        sql.getFormattedSql());
+  }
+
+  @Test
+  void insert_select_entity_join_select() {
+    Emp_ e = new Emp_();
+    Dept_ d = new Dept_();
+    Statement<Integer> stmt =
+        nativeSql.insert(e).select(c -> c.from(d).innerJoin(e, on -> on.eq(d.id, e.id)).select(e));
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "insert into EMP (ID, NAME, SALARY, VERSION) select t1_.ID, t1_.NAME, t1_.SALARY, t1_.VERSION from CATA.DEPT t0_ inner join EMP t1_ on (t0_.ID = t1_.ID)",
+        sql.getFormattedSql());
+  }
+
   @Test
   void insert_select_properties() {
     Emp_ e = new Emp_();

doma-core/src/test/java/org/seasar/doma/jdbc/criteria/NativeSqlSelectTest.java

@@ -406,6 +406,18 @@ void where_exist() {
         sql.getFormattedSql());
   }
 
+  @Test
+  void where_exist_without_select() {
+    Emp_ e = new Emp_();
+    Dept_ d = new Dept_();
+    Buildable<?> stmt = nativeSql.from(e).where(c -> c.exists(c.from(d))).select(e.id);
+
+    Sql<?> sql = stmt.asSql();
+    assertEquals(
+        "select t0_.ID from EMP t0_ where exists (select t1_.ID, t1_.NAME from CATA.DEPT t1_)",
+        sql.getFormattedSql());
+  }
+
   @Test
   void where_notExist() {
     Emp_ e = new Emp_();