Associate entities only once per unique combination (#891)

nakamura-to · web-flow · commit 30d446e986cb · 2022-10-08T11:33:52.000+09:00
diff --git a/doma-core/src/main/java/org/seasar/doma/internal/util/Combinations.java b/doma-core/src/main/java/org/seasar/doma/internal/util/Combinations.java
@@ -0,0 +1,20 @@
+package org.seasar.doma.internal.util;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class Combinations<T> {
+
+  private final Set<Pair<T, T>> pairs = new HashSet<>();
+
+  public boolean contains(Pair<T, T> pair) {
+    if (pairs.contains(pair)) {
+      return true;
+    }
+    return pairs.contains(new Pair<>(pair.snd, pair.fst));
+  }
+
+  public void add(Pair<T, T> pair) {
+    pairs.add(pair);
+  }
+}
diff --git a/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java b/doma-core/src/main/java/org/seasar/doma/jdbc/criteria/command/AssociateCommand.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiFunction;
+import org.seasar.doma.internal.util.Combinations;
 import org.seasar.doma.internal.util.Pair;
 import org.seasar.doma.jdbc.command.Command;
 import org.seasar.doma.jdbc.command.SelectCommand;
@@ -32,6 +33,7 @@ public AssociateCommand(
   @SuppressWarnings("unchecked")
   public List<ENTITY> execute() {
     Map<EntityKey, Object> cache = new LinkedHashMap<>();
+    Combinations<EntityKey> combinations = new Combinations<>();
     SelectCommand<List<EntityPool>> command =
         new SelectCommand<>(
             query, new EntityPoolIterationHandler(context.getProjectionEntityMetamodels()));
@@ -55,7 +57,7 @@ public List<ENTITY> execute() {
                 });
         associationCandidate.put(key.getEntityMetamodel(), new Pair<>(key, entity));
       }
-      associate(cache, associationCandidate);
+      associate(cache, combinations, associationCandidate);
     }
     return (List<ENTITY>)
         cache.entrySet().stream()
@@ -66,6 +68,7 @@ public List<ENTITY> execute() {
 
   private void associate(
       Map<EntityKey, Object> cache,
+      Combinations<EntityKey> combinations,
       Map<EntityMetamodel<?>, Pair<EntityKey, Object>> associationCandidate) {
     for (Map.Entry<Pair<EntityMetamodel<?>, EntityMetamodel<?>>, BiFunction<Object, Object, Object>>
         e : context.associations.entrySet()) {
@@ -76,11 +79,16 @@ private void associate(
       if (keyAndEntity1 == null || keyAndEntity2 == null) {
         continue;
       }
+      Pair<EntityKey, EntityKey> keyPair = new Pair<>(keyAndEntity1.fst, keyAndEntity2.fst);
+      if (combinations.contains(keyPair)) {
+        continue;
+      }
       Object newEntity = associator.apply(keyAndEntity1.snd, keyAndEntity2.snd);
       if (newEntity != null) {
         cache.replace(keyAndEntity1.fst, newEntity);
         associationCandidate.replace(metamodelPair.fst, new Pair<>(keyAndEntity1.fst, newEntity));
       }
+      combinations.add(keyPair);
     }
   }
 
diff --git a/doma-core/src/test/java/org/seasar/doma/internal/util/CombinationsTest.java b/doma-core/src/test/java/org/seasar/doma/internal/util/CombinationsTest.java
@@ -0,0 +1,23 @@
+package org.seasar.doma.internal.util;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class CombinationsTest {
+
+  @Test
+  void test() {
+    Combinations<String> combinations = new Combinations<>();
+    combinations.add(new Pair<>("A", "B"));
+    combinations.add(new Pair<>("A", "C"));
+
+    assertTrue(combinations.contains(new Pair<>("A", "B")));
+    assertTrue(combinations.contains(new Pair<>("B", "A")));
+    assertTrue(combinations.contains(new Pair<>("A", "C")));
+    assertTrue(combinations.contains(new Pair<>("C", "A")));
+    assertFalse(combinations.contains(new Pair<>("B", "C")));
+    assertFalse(combinations.contains(new Pair<>("C", "B")));
+  }
+}
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-db2.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-db2.script
@@ -28,6 +28,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(1
 CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-h2.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-h2.script
@@ -29,6 +29,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(1
 CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-hsqldb.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-hsqldb.script
@@ -33,6 +33,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(1
 CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql.script
@@ -26,6 +26,10 @@ CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);
+CREATE TABLE COACH(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql2008.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mssql2008.script
@@ -26,6 +26,10 @@ CREATE TABLE TABLE_STRATEGY(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY5(ID INT NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);
+CREATE TABLE COACH(ID INT NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INT);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mysql.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-mysql.script
@@ -25,6 +25,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(1
 CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-oracle.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-oracle.script
@@ -29,6 +29,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHA
 CREATE TABLE TABLE_STRATEGY(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
 CREATE TABLE TABLE_STRATEGY2(ID NUMERIC(8) NOT NULL PRIMARY KEY, VALUE VARCHAR2(10));
 
+CREATE TABLE TEAM(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID NUMERIC(8));
+CREATE TABLE COACH(ID NUMERIC(8) NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID NUMERIC(8));
+
 CREATE INDEX IX_EMPLOYEE_1 ON EMPLOYEE (EMPLOYEE_NAME);
 
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-postgres.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-postgres.script
@@ -32,6 +32,10 @@ CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10))
 CREATE TABLE PRODUCT(ID INTEGER NOT NULL PRIMARY KEY, VALUE XML);
 CREATE TABLE VERY_LONG_CHARACTERS_NAMED_TABLE(VERY_LONG_CHARACTERS_NAMED_TABLE_ID SERIAL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-sqlite.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/create-sqlite.script
@@ -25,6 +25,10 @@ CREATE TABLE SEQUENCE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(1
 CREATE TABLE TABLE_STRATEGY(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 CREATE TABLE TABLE_STRATEGY2(ID INTEGER NOT NULL PRIMARY KEY, VALUE VARCHAR(10));
 
+CREATE TABLE TEAM(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20));
+CREATE TABLE PLAYER(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+CREATE TABLE COACH(ID INTEGER NOT NULL PRIMARY KEY, NAME VARCHAR(20), TEAM_ID INTEGER);
+
 INSERT INTO DEPARTMENT VALUES(1,10,'ACCOUNTING','NEW YORK',1);
 INSERT INTO DEPARTMENT VALUES(2,20,'RESEARCH','DALLAS',1);
 INSERT INTO DEPARTMENT VALUES(3,30,'SALES','CHICAGO',1);
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-db2.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-db2.script
@@ -37,5 +37,9 @@ DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
 
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
+
 DROP SEQUENCE SEQUENCE_STRATEGY_ID;
 DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-h2.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-h2.script
@@ -26,5 +26,9 @@ DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
 
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
+
 DROP SEQUENCE SEQUENCE_STRATEGY_ID;
 DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-hsqldb.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-hsqldb.script
@@ -25,5 +25,9 @@ DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
 
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
+
 DROP SEQUENCE SEQUENCE_STRATEGY_ID;
 DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mssql.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mssql.script
@@ -42,4 +42,8 @@ DROP TABLE SEQUENCE_STRATEGY;
 DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
-DROP TABLE TABLE_STRATEGY5;
+DROP TABLE TABLE_STRATEGY5;
+
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mssql2008.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mssql2008.script
@@ -42,4 +42,8 @@ DROP TABLE SEQUENCE_STRATEGY;
 DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
-DROP TABLE TABLE_STRATEGY5;
+DROP TABLE TABLE_STRATEGY5;
+
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mysql.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-mysql.script
@@ -41,4 +41,8 @@ DROP TABLE IDENTITY_STRATEGY;
 DROP TABLE SEQUENCE_STRATEGY;
 DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
-DROP TABLE TABLE_STRATEGY2;
+DROP TABLE TABLE_STRATEGY2;
+
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-oracle.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-oracle.script
@@ -47,4 +47,8 @@ DROP TABLE PATTERN;
 
 DROP SEQUENCE AUTO_STRATEGY_ID;
 DROP SEQUENCE SEQUENCE_STRATEGY_ID;
-DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
+DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
+
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-postgres.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-postgres.script
@@ -51,5 +51,9 @@ DROP TABLE TABLE_STRATEGY2;
 DROP TABLE PRODUCT;
 DROP TABLE VERY_LONG_CHARACTERS_NAMED_TABLE;
 
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
+
 DROP SEQUENCE SEQUENCE_STRATEGY_ID;
 DROP SEQUENCE MY_SEQUENCE_STRATEGY_ID;
diff --git a/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-sqlite.script b/integration-test-common/src/main/resources/META-INF/org/seasar/doma/it/dao/ScriptDao/drop-sqlite.script
@@ -24,3 +24,7 @@ DROP TABLE SEQUENCE_STRATEGY;
 DROP TABLE SEQUENCE_STRATEGY2;
 DROP TABLE TABLE_STRATEGY;
 DROP TABLE TABLE_STRATEGY2;
+
+DROP TABLE TEAM;
+DROP TABLE PLAYER;
+DROP TABLE COACH;
diff --git a/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Coach.java b/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Coach.java
@@ -0,0 +1,46 @@
+package org.seasar.doma.it.criteria;
+
+import org.seasar.doma.Entity;
+import org.seasar.doma.Id;
+import org.seasar.doma.Metamodel;
+
+@Entity(metamodel = @Metamodel)
+public class Coach {
+  @Id private Integer id;
+  private String name;
+
+  private Integer teamId;
+
+  public Coach() {}
+
+  public Coach(Integer id, String name, Integer teamId) {
+    this();
+    this.id = id;
+    this.name = name;
+    this.teamId = teamId;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Integer getTeamId() {
+    return teamId;
+  }
+
+  public void setTeamId(Integer teamId) {
+    this.teamId = teamId;
+  }
+}
diff --git a/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Player.java b/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Player.java
@@ -0,0 +1,47 @@
+package org.seasar.doma.it.criteria;
+
+import org.seasar.doma.Entity;
+import org.seasar.doma.Id;
+import org.seasar.doma.Metamodel;
+
+@Entity(metamodel = @Metamodel)
+public class Player {
+
+  @Id private Integer id;
+  private String name;
+
+  private Integer teamId;
+
+  public Player() {}
+
+  public Player(Integer id, String name, Integer teamId) {
+    this();
+    this.id = id;
+    this.name = name;
+    this.teamId = teamId;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Integer getTeamId() {
+    return teamId;
+  }
+
+  public void setTeamId(Integer teamId) {
+    this.teamId = teamId;
+  }
+}
diff --git a/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Team.java b/integration-test-java/src/main/java/org/seasar/doma/it/criteria/Team.java
diff --git a/integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlSelectTest.java b/integration-test-java/src/test/java/org/seasar/doma/it/criteria/EntityqlSelectTest.java
