Merge branch 'master' of https://github.com/FrantaM/mybatis-3

Author: emacarron

src/test/java/domain/blog/BlogLite.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 MyBatis.org.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package domain.blog;
+
+import java.util.List;
+
+public class BlogLite {
+
+  private int id;
+  private List<PostLite> posts;
+
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  public List<PostLite> getPosts() {
+    return posts;
+  }
+
+  public void setPosts(List<PostLite> posts) {
+    this.posts = posts;
+  }
+}

src/test/java/org/apache/ibatis/builder/PostMapper.xml

@@ -35,6 +35,26 @@
       </constructor>
   </resultMap>
 
+  <resultMap id="postLiteMap2NestedWithSelect" type="domain.blog.BlogLite">
+    <id column="blog_id" property="id" />
+    <collection property="posts" ofType="domain.blog.PostLite">
+      <constructor>
+          <arg javaType="domain.blog.PostLiteId" column="{id=id}" select="selectPostLiteId" />
+          <arg javaType="_int" column="blog_id"/>
+      </constructor>
+    </collection>
+  </resultMap>
+
+  <resultMap id="postLiteMap2NestedWithoutSelect" type="domain.blog.BlogLite">
+    <id column="blog_id" property="id" />
+    <collection property="posts" ofType="domain.blog.PostLite">
+      <constructor>
+          <arg javaType="domain.blog.PostLiteId" resultMap="postLiteIdMap" />
+          <arg javaType="_int" column="blog_id"/>
+      </constructor>
+    </collection>
+  </resultMap>
+
   <resultMap id="mutablePostLiteMap" type="domain.blog.PostLite">
       <result property="blogId" column="blog_id"/>
       <association property="id" column="id" resultMap="postLiteIdMap"/>
@@ -48,6 +68,18 @@
       select id, blog_id from post where blog_id is not null
   </select>
 
+  <select id="selectPostLite2NestedWithSelect" resultMap="postLiteMap2NestedWithSelect">
+      select id, 1 as blog_id from post where blog_id is not null
+  </select>
+
+  <select id="selectPostLite2NestedWithoutSelect" resultMap="postLiteMap2NestedWithoutSelect">
+      select id, 1 as blog_id from post where blog_id is not null
+  </select>
+
+  <select id="selectPostLiteId" resultMap="postLiteIdMap">
+      select ${id} as id from (values(0)) as t
+  </select>
+
   <select id="selectMutablePostLite" resultMap="mutablePostLiteMap">
       select id, blog_id from post where blog_id is not null
   </select>

src/test/java/org/apache/ibatis/session/SqlSessionManagerTest.java

@@ -479,6 +479,20 @@ public void shouldFindAllPostLites() throws Exception {
     assertEquals(4, posts.size());
   }
 
+  @Test
+  public void shouldFindAllPostLitesWithNestedSelect() throws Exception {
+    final BlogLite blog = manager.selectOne("domain.blog.mappers.PostMapper.selectPostLite2NestedWithSelect");
+    assertNotNull(blog);
+    assertEquals(4, blog.getPosts().size());
+  }
+
+  @Test
+  public void shouldFindAllPostLitesWithNestedResultMap() throws Exception {
+    final BlogLite blog = manager.selectOne("domain.blog.mappers.PostMapper.selectPostLite2NestedWithoutSelect");
+    assertNotNull(blog);
+    assertEquals(4, blog.getPosts().size());
+  }
+
   @Test
   public void shouldFindAllMutablePostLites() throws Exception {
     List<PostLite> posts = manager.selectList("domain.blog.mappers.PostMapper.selectMutablePostLite");