Type handler should be applied to args for nested select

For "composite keys", the behavior changes depending on the existence of `parameterType`
When `parameterType` is not specified, parameter values are stored in a `Map` and custom type handler is not used.
When `parameterType="User"` is specified, `User` instance is created and properties are set using type handlers.
Related to gh-114

For "simple key", `parameterType` is ignored and custom type handler is not used at all.

I can think of some corner cases caused by these behaviors, but will deal with them when/if they come up.

Author: harawata

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

@@ -1087,21 +1087,23 @@ private Object prepareParameterForNestedQuery(ResultSetWrapper rsw, ResultMappin
 
   private Object prepareSimpleKeyParameter(ResultSetWrapper rsw, ResultMapping resultMapping, Class<?> parameterType,
       String columnPrefix) throws SQLException {
+    // parameterType is ignored in this case
     final String columnName = prependPrefix(resultMapping.getColumn(), columnPrefix);
     final TypeHandler<?> typeHandler = rsw.getTypeHandler(parameterType, columnName);
     return typeHandler.getResult(rsw.getResultSet(), columnName);
   }
 
   private Object prepareCompositeKeyParameter(ResultSetWrapper rsw, ResultMapping resultMapping, Class<?> parameterType,
       String columnPrefix) throws SQLException {
+    // Map is used if parameterType is not specified
     final Object parameterObject = instantiateParameterObject(parameterType);
     final MetaObject metaObject = configuration.newMetaObject(parameterObject);
     boolean foundValues = false;
     for (ResultMapping innerResultMapping : resultMapping.getComposites()) {
-      final Class<?> propType = metaObject.getSetterType(innerResultMapping.getProperty());
-      final TypeHandler<?> typeHandler = typeHandlerRegistry.getTypeHandler(propType);
-      final Object propValue = typeHandler.getResult(rsw.getResultSet(),
-          prependPrefix(innerResultMapping.getColumn(), columnPrefix));
+      final String columnName = prependPrefix(innerResultMapping.getColumn(), columnPrefix);
+      final TypeHandler<?> typeHandler = resolvePropertyTypeHandler(rsw, metaObject, innerResultMapping.getColumn(),
+          columnPrefix);
+      final Object propValue = typeHandler.getResult(rsw.getResultSet(), columnName);
       // issue #353 & #560 do not execute nested query if key is null
       if (propValue != null) {
         metaObject.setValue(innerResultMapping.getProperty(), propValue);

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredHandlerMapper.java

@@ -45,4 +45,8 @@ public interface GloballyRegisteredHandlerMapper {
 
   @Select("select id, strvalue, intvalue, strings, integers from users where strvalue = #{p1} and intvalue = #{p2}")
   User getUserByFuzzyBeans(FuzzyBean<String> p1, FuzzyBean<Integer> p2);
+
+  ParentBean selectNestedUser_SingleParam(Integer id);
+
+  ParentBean selectNestedUser_MultiParam(Integer id);
 }

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredTypeHandlerResolutionTest.java

@@ -201,4 +201,22 @@ void shouldHandlerBeAppliedToMultiParams() {
       assertEquals(1, user.getId());
     }
   }
+
+  @Test
+  void shouldHandlerAppliedToNestedSelectSingleParam() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      ParentBean bean = mapper.selectNestedUser_SingleParam(1);
+      assertEquals(1, bean.getUser().getId());
+    }
+  }
+
+  @Test
+  void shouldHandlerAppliedToNestedSelectMultiParam() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      GloballyRegisteredHandlerMapper mapper = sqlSession.getMapper(GloballyRegisteredHandlerMapper.class);
+      ParentBean bean = mapper.selectNestedUser_MultiParam(1);
+      assertEquals(1, bean.getUser().getId());
+    }
+  }
 }

src/test/java/org/apache/ibatis/submitted/typebasedtypehandlerresolution/ParentBean.java

@@ -0,0 +1,38 @@
+/*
+ *    Copyright 2009-2025 the original author or authors.
+ *
+ *    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
+ *
+ *       https://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 org.apache.ibatis.submitted.typebasedtypehandlerresolution;
+
+public class ParentBean {
+  private Integer id;
+  private User user;
+
+  public Integer getId() {
+    return id;
+  }
+
+  public void setId(Integer id) {
+    this.id = id;
+  }
+
+  public User getUser() {
+    return user;
+  }
+
+  public void setUser(User user) {
+    this.user = user;
+  }
+}

src/test/resources/org/apache/ibatis/submitted/typebasedtypehandlerresolution/GloballyRegisteredHandlerMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       Copyright 2009-2025 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -48,4 +48,32 @@
     (#{id}, #{strvalue}, #{intvalue}, #{strings}, #{integers})
   ]]></insert>
 
+  <resultMap id="parentBeanRM_SingleParam" type="org.apache.ibatis.submitted.typebasedtypehandlerresolution.ParentBean">
+    <id property="id" column="id" />
+    <association property="user" column="strvalue" select="selectUserByStrvalue" />
+  </resultMap>
+
+  <select id="selectNestedUser_SingleParam" resultMap="parentBeanRM_SingleParam">
+    select id, strvalue, intvalue from users where id = #{id}
+  </select>
+
+  <select id="selectUserByStrvalue" parameterType="org.apache.ibatis.submitted.typebasedtypehandlerresolution.User" resultMap="userRM">
+    select id, strvalue, intvalue, strings, integers from users
+    where strvalue = #{strvalue}
+  </select>
+
+  <resultMap id="parentBeanRM_MultiParam" type="org.apache.ibatis.submitted.typebasedtypehandlerresolution.ParentBean">
+    <id property="id" column="id" />
+    <association property="user" column="{strvalue=strvalue,intvalue=intvalue}" select="selectUserByStrvalueAndIntvalue" />
+  </resultMap>
+
+  <select id="selectNestedUser_MultiParam" resultMap="parentBeanRM_MultiParam">
+    select id, strvalue, intvalue from users where id = #{id}
+  </select>
+
+  <select id="selectUserByStrvalueAndIntvalue" parameterType="org.apache.ibatis.submitted.typebasedtypehandlerresolution.User" resultMap="userRM">
+    select id, strvalue, intvalue, strings, integers from users
+    where strvalue = #{strvalue} and intvalue = #{intvalue}
+  </select>
+
 </mapper>