[Gradle Release Plugin] - pre tag commit: '2.36.0-beta-1'.

Author: nakamura-to

README.md

@@ -55,8 +55,8 @@ Build with Gradle
 
 ```groovy
 dependencies {
-    implementation "org.seasar.doma:doma-core:2.35.0"
-    annotationProcessor "org.seasar.doma:doma-processor:2.35.0"
+    implementation "org.seasar.doma:doma-core:2.36.0-beta-1"
+    annotationProcessor "org.seasar.doma:doma-processor:2.36.0-beta-1"
 }
 ```
 

docs/build.rst

@@ -35,8 +35,8 @@ Write your build.gradle as follows:
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma-core:2.35.0"
-      annotationProcessor "org.seasar.doma:doma-processor:2.35.0"
+      implementation "org.seasar.doma:doma-core:2.36.0-beta-1"
+      annotationProcessor "org.seasar.doma:doma-processor:2.36.0-beta-1"
   }
 
 To simplify your build.script, we recommend that you use the `Doma Compile Plugin`_.

docs/kotlin-support.rst

@@ -99,8 +99,8 @@ Add the dependencies using the `kapt` and `implementation` configuration in your
 .. code-block:: groovy
 
   dependencies {
-      implementation "org.seasar.doma:doma-core:2.35.0"
-      kapt "org.seasar.doma:doma-processor:2.35.0"
+      implementation "org.seasar.doma:doma-core:2.36.0-beta-1"
+      kapt "org.seasar.doma:doma-processor:2.36.0-beta-1"
   }
 
 To simplify your build.script, we recommend you use

doma-core/src/main/java/org/seasar/doma/internal/Artifact.java

@@ -7,7 +7,7 @@ public final class Artifact {
 
   private static final String NAME = "Doma";
 
-  private static final String VERSION = "2.35.0";
+  private static final String VERSION = "2.36.0-beta-1";
 
   public static String getName() {
     return NAME;

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

@@ -18,7 +18,7 @@
 import org.seasar.doma.jdbc.criteria.statement.EntityqlBatchUpdateStatement;
 import org.seasar.doma.jdbc.criteria.statement.EntityqlDeleteStatement;
 import org.seasar.doma.jdbc.criteria.statement.EntityqlInsertStatement;
-import org.seasar.doma.jdbc.criteria.statement.EntityqlSelectStatement;
+import org.seasar.doma.jdbc.criteria.statement.EntityqlSelectStarting;
 import org.seasar.doma.jdbc.criteria.statement.EntityqlUpdateStatement;
 import org.seasar.doma.jdbc.criteria.statement.Statement;
 
@@ -30,19 +30,19 @@ public Entityql(Config config) {
     this.config = Objects.requireNonNull(config);
   }
 
-  public <ENTITY> EntityqlSelectStatement<ENTITY> from(EntityMetamodel<ENTITY> entityMetamodel) {
+  public <ENTITY> EntityqlSelectStarting<ENTITY> from(EntityMetamodel<ENTITY> entityMetamodel) {
     Objects.requireNonNull(entityMetamodel);
     return from(entityMetamodel, settings -> {});
   }
 
-  public <ENTITY> EntityqlSelectStatement<ENTITY> from(
+  public <ENTITY> EntityqlSelectStarting<ENTITY> from(
       EntityMetamodel<ENTITY> entityMetamodel, Consumer<SelectSettings> settingsConsumer) {
     Objects.requireNonNull(entityMetamodel);
     Objects.requireNonNull(settingsConsumer);
     SelectContext context = new SelectContext(entityMetamodel);
     settingsConsumer.accept(context.getSettings());
     SelectFromDeclaration declaration = new SelectFromDeclaration(context);
-    return new EntityqlSelectStatement<>(config, declaration);
+    return new EntityqlSelectStarting<>(config, declaration, entityMetamodel);
   }
 
   public <ENTITY> Statement<Result<ENTITY>> update(

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

@@ -19,19 +19,22 @@
 public class AssociateCommand<ENTITY> implements Command<List<ENTITY>> {
   private final SelectContext context;
   private final SelectQuery query;
+  private final EntityMetamodel<ENTITY> entityMetamodel;
 
-  public AssociateCommand(SelectContext context, SelectQuery query) {
+  public AssociateCommand(
+      SelectContext context, SelectQuery query, EntityMetamodel<ENTITY> entityMetamodel) {
     this.context = Objects.requireNonNull(context);
     this.query = Objects.requireNonNull(query);
+    this.entityMetamodel = Objects.requireNonNull(entityMetamodel);
   }
 
   @Override
   @SuppressWarnings("unchecked")
   public List<ENTITY> execute() {
     Map<EntityKey, Object> cache = new LinkedHashMap<>();
-    List<EntityMetamodel<?>> entityMetamodels = context.allEntityDefs();
     SelectCommand<List<EntityPool>> command =
-        new SelectCommand<>(query, new EntityPoolIterationHandler(entityMetamodels));
+        new SelectCommand<>(
+            query, new EntityPoolIterationHandler(context.getProjectionEntityMetamodels()));
     List<EntityPool> entityPools = command.execute();
     for (EntityPool entityPool : entityPools) {
       Map<EntityMetamodel<?>, Object> associationCandidate = new LinkedHashMap<>();
@@ -56,7 +59,7 @@ public List<ENTITY> execute() {
     }
     return (List<ENTITY>)
         cache.entrySet().stream()
-            .filter(e -> e.getKey().getEntityMetamodel() == context.entityMetamodel)
+            .filter(e -> e.getKey().getEntityMetamodel() == entityMetamodel)
             .map(Map.Entry::getValue)
             .collect(toList());
   }

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

@@ -1,11 +1,15 @@
 package org.seasar.doma.jdbc.criteria.command;
 
+import java.util.List;
 import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel;
 import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 
 public interface DataRow {
 
   <ENTITY> ENTITY get(EntityMetamodel<ENTITY> entityEntityMetamodel);
 
+  <ENTITY> ENTITY get(
+      EntityMetamodel<ENTITY> entityEntityMetamodel, List<PropertyMetamodel<?>> propertyMetamodels);
+
   <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyMetamodel);
 }

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

@@ -1,24 +1,27 @@
 package org.seasar.doma.jdbc.criteria.command;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import org.seasar.doma.internal.jdbc.command.AbstractIterationHandler;
 import org.seasar.doma.internal.jdbc.command.ResultListCallback;
 import org.seasar.doma.jdbc.ObjectProvider;
 import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel;
+import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 import org.seasar.doma.jdbc.query.SelectQuery;
 
 public class EntityPoolIterationHandler
     extends AbstractIterationHandler<EntityPool, List<EntityPool>> {
-  private final List<EntityMetamodel<?>> entityMetamodels;
+  private final Map<EntityMetamodel<?>, List<PropertyMetamodel<?>>> projectionEntityMetamodels;
 
-  public EntityPoolIterationHandler(List<EntityMetamodel<?>> entityMetamodels) {
+  public EntityPoolIterationHandler(
+      Map<EntityMetamodel<?>, List<PropertyMetamodel<?>>> projectionEntityMetamodels) {
     super(new ResultListCallback<>());
-    this.entityMetamodels = Objects.requireNonNull(entityMetamodels);
+    this.projectionEntityMetamodels = Objects.requireNonNull(projectionEntityMetamodels);
   }
 
   @Override
   protected ObjectProvider<EntityPool> createObjectProvider(SelectQuery query) {
-    return new EntityPoolProvider(entityMetamodels, query);
+    return new EntityPoolProvider(projectionEntityMetamodels, query);
   }
 }

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

@@ -12,17 +12,19 @@
 import java.util.stream.Collectors;
 import org.seasar.doma.jdbc.ObjectProvider;
 import org.seasar.doma.jdbc.criteria.metamodel.EntityMetamodel;
+import org.seasar.doma.jdbc.criteria.metamodel.PropertyMetamodel;
 import org.seasar.doma.jdbc.entity.EntityPropertyType;
 import org.seasar.doma.jdbc.entity.EntityType;
 import org.seasar.doma.jdbc.entity.Property;
 import org.seasar.doma.jdbc.query.Query;
 
 public class EntityPoolProvider implements ObjectProvider<EntityPool> {
-  private final List<EntityMetamodel<?>> entityMetamodels;
+  private final Map<EntityMetamodel<?>, List<PropertyMetamodel<?>>> projectionEntityMetamodels;
   private final FetchSupport fetchSupport;
 
-  public EntityPoolProvider(List<EntityMetamodel<?>> entityMetamodels, Query query) {
-    this.entityMetamodels = Objects.requireNonNull(entityMetamodels);
+  public EntityPoolProvider(
+      Map<EntityMetamodel<?>, List<PropertyMetamodel<?>>> projectionEntityMetamodels, Query query) {
+    this.projectionEntityMetamodels = Objects.requireNonNull(projectionEntityMetamodels);
     Objects.requireNonNull(query);
     this.fetchSupport = new FetchSupport(query);
   }
@@ -33,9 +35,13 @@ public EntityPool get(ResultSet resultSet) throws SQLException {
     Objects.requireNonNull(resultSet);
     EntityPool entityPool = new EntityPool();
     int index = 1;
-    for (EntityMetamodel<?> entityMetamodel : entityMetamodels) {
+    for (Map.Entry<EntityMetamodel<?>, List<PropertyMetamodel<?>>> entry :
+        projectionEntityMetamodels.entrySet()) {
+      EntityMetamodel<?> entityMetamodel = entry.getKey();
+      List<PropertyMetamodel<?>> projectionTargets = entry.getValue();
       EntityType<?> entityType = entityMetamodel.asType();
-      List<? extends EntityPropertyType<?, ?>> propertyTypes = entityType.getEntityPropertyTypes();
+      List<? extends EntityPropertyType<?, ?>> propertyTypes =
+          projectionTargets.stream().map(PropertyMetamodel::asType).collect(toList());
       List<Prop> props = new ArrayList<>(propertyTypes.size());
       for (EntityPropertyType<?, ?> propertyType : propertyTypes) {
         Property<Object, ?> property = (Property<Object, ?>) propertyType.createProperty();

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

@@ -35,11 +35,17 @@ public RESULT get(ResultSet resultSet) throws SQLException {
 
           @Override
           public <ENTITY> ENTITY get(EntityMetamodel<ENTITY> entityMetamodel) {
-            List<PropertyMetamodel<?>> propertyDefs = entityMetamodel.allPropertyMetamodels();
-            Map<String, Property<ENTITY, ?>> states = new HashMap<>(propertyDefs.size());
-            List<Object> rawValues = new ArrayList<>(propertyDefs.size());
-            for (PropertyMetamodel<?> propertyDef : propertyDefs) {
-              EntityPropertyType<?, ?> propertyType = propertyDef.asType();
+            return get(entityMetamodel, entityMetamodel.allPropertyMetamodels());
+          }
+
+          @Override
+          public <ENTITY> ENTITY get(
+              EntityMetamodel<ENTITY> entityMetamodel,
+              List<PropertyMetamodel<?>> propertyMetamodels) {
+            Map<String, Property<ENTITY, ?>> states = new HashMap<>(propertyMetamodels.size());
+            List<Object> rawValues = new ArrayList<>(propertyMetamodels.size());
+            for (PropertyMetamodel<?> propertyMetamodel : propertyMetamodels) {
+              EntityPropertyType<?, ?> propertyType = propertyMetamodel.asType();
               Property<ENTITY, ?> property = (Property<ENTITY, ?>) propertyType.createProperty();
               try {
                 Object rawValue = fetchSupport.fetch(resultSet, property, index++);
@@ -61,8 +67,8 @@ public <ENTITY> ENTITY get(EntityMetamodel<ENTITY> entityMetamodel) {
           }
 
           @Override
-          public <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyDef) {
-            Property<?, ?> property = propertyDef.asType().createProperty();
+          public <PROPERTY> PROPERTY get(PropertyMetamodel<PROPERTY> propertyMetamodel) {
+            Property<?, ?> property = propertyMetamodel.asType().createProperty();
             try {
               fetchSupport.fetch(resultSet, property, index++);
             } catch (SQLException e) {