Fixes #103. Property mappings were ignored when handling constructors.

Author: emacarron

src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java

@@ -286,7 +286,7 @@ private void handleRowValuesForSimpleResultMap(ResultSetWrapper rsw, ResultMap r
     skipRows(rsw.getResultSet(), rowBounds);
     while (shouldProcessMoreRows(rsw.getResultSet(), resultContext, rowBounds)) {
       ResultMap discriminatedResultMap = resolveDiscriminatedResultMap(rsw.getResultSet(), resultMap, null);
-      Object rowValue = getRowValue(rsw, discriminatedResultMap, null);
+      Object rowValue = getRowValue(rsw, discriminatedResultMap);
       storeObject(resultHandler, resultContext, rowValue, parentMapping, rsw.getResultSet());
     }
   }
@@ -324,7 +324,7 @@ private void skipRows(ResultSet rs, RowBounds rowBounds) throws SQLException {
   // GET VALUE FROM ROW FOR SIMPLE RESULT MAP
   //
 
-  private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap, CacheKey rowKey) throws SQLException {
+  private Object getRowValue(ResultSetWrapper rsw, ResultMap resultMap) throws SQLException {
     final ResultLoaderMap lazyLoader = instantiateResultLoaderMap();
     Object resultObject = createResultObject(rsw, resultMap, lazyLoader, null);
     if (resultObject != null && !typeHandlerRegistry.hasTypeHandler(resultMap.getType())) {
@@ -543,8 +543,7 @@ private Object createParameterizedResultObject(ResultSetWrapper rsw, Class<?> re
         value = getNestedQueryConstructorValue(rsw.getResultSet(), constructorMapping, columnPrefix);
       } else if (constructorMapping.getNestedResultMapId() != null) {
         final ResultMap resultMap = configuration.getResultMap(constructorMapping.getNestedResultMapId());
-        final ResultLoaderMap lazyLoader = instantiateResultLoaderMap();
-        value = createResultObject(rsw, resultMap, lazyLoader, columnPrefix);
+        value = getRowValue(rsw, resultMap);
       } else {
         final TypeHandler<?> typeHandler = constructorMapping.getTypeHandler();
         value = typeHandler.getResult(rsw.getResultSet(), prependPrefix(column, columnPrefix));

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -376,8 +376,29 @@ public void shouldExecuteBoundSelectBlogUsingConstructorWithResultMap() {
     }
   }
 
+  @Test
+  public void shouldExecuteBoundSelectBlogUsingConstructorWithResultMapAndProperties() {
+    SqlSession session = sqlSessionFactory.openSession();
+    try {
+      BoundBlogMapper mapper = session.getMapper(BoundBlogMapper.class);
+      Blog blog = mapper.selectBlogUsingConstructorWithResultMapAndProperties(1);
+      assertEquals(1, blog.getId());
+      assertEquals("Jim Business", blog.getTitle());
+      assertNotNull("author should not be null", blog.getAuthor());
+      Author author = blog.getAuthor();
+      assertEquals(101, author.getId());
+      assertEquals("[email protected]", author.getEmail());
+      assertEquals("jim", author.getUsername());
+      List<Post> posts = blog.getPosts();
+      assertTrue("posts should not be empty", posts != null);
+      assertEquals(2, posts.size());
+    } finally {
+      session.close();
+    }
+  }
+  
   @Ignore
-  @Test // issue #480
+  @Test // issue #480 and #101
   public void shouldExecuteBoundSelectBlogUsingConstructorWithResultMapCollection() {
     SqlSession session = sqlSessionFactory.openSession();
     try {

src/test/java/org/apache/ibatis/binding/BoundAuthorMapper.xml

@@ -34,6 +34,15 @@
       </constructor>
   </resultMap>
 
+  <resultMap id="authorResultMapWithProperties" type="domain.blog.Author">
+      <id column="author_id" property="id"/>
+      <result column="author_username" property="username" />
+      <result column="author_password" property="password"/>
+      <result column="author_email" property="email"/>
+      <result column="author_bio" property="bio"/>
+      <result column="favourite_section" javaType="domain.blog.Section"/>
+  </resultMap>
+
   <insert id="insertAuthor" parameterType="domain.blog.Author">
     <selectKey keyProperty="id" resultType="int" order="BEFORE">
       select CAST(RANDOM()*1000000 as INTEGER) a from SYSIBM.SYSDUMMY1

src/test/java/org/apache/ibatis/binding/BoundBlogMapper.java

@@ -111,6 +111,8 @@ public interface BoundBlogMapper {
 
   Blog selectBlogUsingConstructorWithResultMap(int i);
 
+  Blog selectBlogUsingConstructorWithResultMapAndProperties(int i);
+  
   Blog selectBlogUsingConstructorWithResultMapCollection(int i);
 
   Blog selectBlogByIdUsingConstructor(int id);

src/test/java/org/apache/ibatis/binding/BoundBlogMapper.xml

@@ -58,6 +58,15 @@
         </constructor>
     </resultMap>
 
+    <resultMap id="blogUsingConstructorWithResultMapAndProperties" type="Blog">
+        <constructor>
+            <idArg column="id" javaType="_int"/>
+            <arg column="title" javaType="java.lang.String"/>
+            <arg javaType="domain.blog.Author" resultMap="org.apache.ibatis.binding.BoundAuthorMapper.authorResultMapWithProperties"/>
+            <arg column="id" javaType="java.util.List" select="selectPostsForBlog"/>
+        </constructor>
+    </resultMap>
+
     <resultMap id="blogUsingConstructorWithResultMapCollection" type="Blog">
         <constructor>
             <idArg column="id" javaType="_int"/>
@@ -98,6 +107,20 @@
       on b.author_id = a.id 
       where b.id = #{id}
     </select>
+
+    <select id="selectBlogUsingConstructorWithResultMapAndProperties" parameterType="int"
+            resultMap="blogUsingConstructorWithResultMapAndProperties">
+      select b.*, 
+      	a.id as author_id, 
+      	a.username as author_username, 
+      	a.password as author_password, 
+      	a.email as author_email, 
+      	a.bio as author_bio, 
+      	a.favourite_section 
+      from Blog b join Author a 
+      on b.author_id = a.id 
+      where b.id = #{id}
+    </select>
 
     <select id="selectBlogUsingConstructorWithResultMapCollection" parameterType="int"
             resultMap="blogUsingConstructorWithResultMapCollection">