Add tests

Author: nakamura-to

doma-core/src/main/java/org/seasar/doma/internal/jdbc/sql/NodePreparedSqlBuilder.java

@@ -27,6 +27,7 @@
 import java.util.ListIterator;
 import java.util.StringJoiner;
 import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -121,7 +122,7 @@ public class NodePreparedSqlBuilder
 
   protected final BiConsumer<PopulateNode, SqlContext> valuesPopulater;
 
-  protected final Function<ExpandNode, List<String>> aggregateColumnsExpander;
+  protected final BiFunction<ExpandNode, String, List<String>> aggregateColumnsExpander;
 
   public NodePreparedSqlBuilder(Config config, SqlKind kind, String sqlFilePath) {
     this(
@@ -185,7 +186,7 @@ public NodePreparedSqlBuilder(
         sqlLogType,
         columnsExpander,
         valuesPopulater,
-        (node) -> Collections.emptyList());
+        (node, alias) -> Collections.emptyList());
   }
 
   public NodePreparedSqlBuilder(
@@ -196,7 +197,7 @@ public NodePreparedSqlBuilder(
       SqlLogType sqlLogType,
       Function<ExpandNode, List<String>> columnsExpander,
       BiConsumer<PopulateNode, SqlContext> valuesPopulater,
-      Function<ExpandNode, List<String>> aggregateColumnsExpander) {
+      BiFunction<ExpandNode, String, List<String>> aggregateColumnsExpander) {
     assertNotNull(
         config, kind, evaluator, columnsExpander, valuesPopulater, aggregateColumnsExpander);
     this.config = config;
@@ -827,7 +828,7 @@ public Void visitExpandNode(ExpandNode node, Context p) {
     for (String column : columnsExpander.apply(node)) {
       joiner.add(prefix + column);
     }
-    for (String column : aggregateColumnsExpander.apply(node)) {
+    for (String column : aggregateColumnsExpander.apply(node, alias)) {
       joiner.add(column);
     }
     String joined = joiner.toString();

doma-core/src/main/java/org/seasar/doma/jdbc/query/AbstractSelectQuery.java

@@ -17,9 +17,11 @@
 
 import static org.seasar.doma.internal.util.AssertionUtil.assertNotNull;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -127,7 +129,7 @@ protected List<String> expandColumns(ExpandNode node) {
         .collect(Collectors.toList());
   }
 
-  protected List<String> expandAggregateColumns(ExpandNode node) {
+  protected List<String> expandAggregateColumns(ExpandNode node, String aliasCsv) {
     if (entityType == null) {
       SqlLocation location = node.getLocation();
       throw new JdbcException(
@@ -136,6 +138,11 @@ protected List<String> expandAggregateColumns(ExpandNode node) {
     if (aggregateStrategyType == null) {
       return List.of();
     }
+    Set<String> aliases =
+        Arrays.stream(aliasCsv.split(","))
+            .map(String::trim)
+            .filter(s -> !s.isEmpty())
+            .collect(Collectors.toSet());
     Stream<Pair<String, EntityPropertyType<?, ?>>> rootColumns =
         entityType.getEntityPropertyTypes().stream()
             .map(
@@ -154,6 +161,7 @@ protected List<String> expandAggregateColumns(ExpandNode node) {
     Naming naming = config.getNaming();
     Dialect dialect = config.getDialect();
     return Stream.concat(rootColumns, associationColumns)
+        .filter(p -> aliases.isEmpty() || aliases.contains(p.fst))
         .map(
             p -> {
               String tableAlias = p.fst;

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

@@ -15,6 +15,7 @@
  */
 package org.seasar.doma.it.criteria;
 
+import java.util.Objects;
 import org.seasar.doma.Domain;
 
 @Domain(valueType = String.class)
@@ -43,4 +44,16 @@ public char charAt(int index) {
   public CharSequence subSequence(int start, int end) {
     return value.subSequence(start, end);
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+    Street street = (Street) o;
+    return Objects.equals(value, street.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(value);
+  }
 }

integration-test-java/src/main/java/org/seasar/doma/it/dao/DepartmentDao.java

@@ -116,6 +116,9 @@ int updateBySqlFile_nonEntity(
   @Select(aggregateStrategy = DepartmentStrategy.class)
   Department selectByIdAsAggregate(Integer departmentId);
 
+  @Select(aggregateStrategy = DepartmentStrategy.class)
+  List<Department> selectByIdsAsAggregate(List<Integer> departmentIds);
+
   @Select(aggregateStrategy = DepartmentStrategy.class)
   List<Department> selectAllAsAggregate();
 

integration-test-java/src/main/java/org/seasar/doma/it/dao/EmployeeDao.java

@@ -195,6 +195,7 @@ interface EmployeeStrategy {
   BiFunction<Employee, Department, Employee> department =
       (e, d) -> {
         e.setDepartment(d);
+        d.getEmployeeList().add(e);
         return e;
       };
 

integration-test-java/src/main/java/org/seasar/doma/it/domain/Identity.java

@@ -15,6 +15,7 @@
  */
 package org.seasar.doma.it.domain;
 
+import java.util.Objects;
 import org.seasar.doma.Domain;
 
 @Domain(valueType = Integer.class)
@@ -29,4 +30,16 @@ public Identity(Integer value) {
   public Integer getValue() {
     return this.value;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+    Identity<?> identity = (Identity<?>) o;
+    return Objects.equals(value, identity.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(value);
+  }
 }

integration-test-java/src/main/java/org/seasar/doma/it/domain/Salary.java

@@ -34,4 +34,35 @@ public Salary(String value) {
   public BigDecimal getValue() {
     return value;
   }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Salary salary = (Salary) o;
+    if (value == null && salary.value == null) {
+      return true;
+    }
+    if (value == null || salary.value == null) {
+      return false;
+    }
+    return value.compareTo(salary.value) == 0;
+  }
+
+  @Override
+  public int hashCode() {
+    if (value == null) {
+      return 0;
+    }
+    return value.stripTrailingZeros().hashCode();
+  }
+
+  @Override
+  public String toString() {
+    return value == null ? null : value.toPlainString();
+  }
 }

integration-test-java/src/main/resources/META-INF/org/seasar/doma/it/dao/DepartmentDao/selectAllAsAggregate.sql

@@ -12,6 +12,7 @@ select
     e.salary as e_salary,
     e.department_id as e_department_id,
     e.address_id as e_address_id,
+    e.version as e_version,
     a.address_id as a_address_id,
     a.street as a_street,
     a.version as a_version

integration-test-java/src/main/resources/META-INF/org/seasar/doma/it/dao/DepartmentDao/selectByIdAsAggregate.sql

@@ -1,5 +1,8 @@
 select
-    /*%expand "d" */*
+    /*%expand "d, e" */*,
+    a.address_id as a_address_id,
+    a.street as a_street,
+    a.version as a_version
 from
     DEPARTMENT d
 left outer join EMPLOYEE e

integration-test-java/src/main/resources/META-INF/org/seasar/doma/it/dao/DepartmentDao/selectByIdsAsAggregate.sql

@@ -0,0 +1,10 @@
+select
+    /*%expand */*
+from
+    DEPARTMENT d
+left outer join EMPLOYEE e
+    on d.department_id = e.department_id
+left outer join ADDRESS a
+    on e.address_id = a.address_id
+where
+    d.department_id in /*departmentIds*/(0)