Take the column prefix into account

Author: harawata

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

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.
@@ -774,8 +774,7 @@ private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, Re
       Param paramAnno = param.getAnnotation(Param.class);
       String paramName = paramAnno == null ? param.getName() : paramAnno.value();
       for (String columnName : rsw.getColumnNames()) {
-        if (paramName.equalsIgnoreCase(
-            configuration.isMapUnderscoreToCamelCase() ? columnName.replace("_", "") : columnName)) {
+        if (columnMatchesParam(columnName, paramName, columnPrefix)) {
           Class<?> paramType = param.getType();
           TypeHandler<?> typeHandler = rsw.getTypeHandler(paramType, columnName);
           Object value = typeHandler.getResult(rsw.getResultSet(), columnName);
@@ -805,6 +804,17 @@ private boolean applyArgNameBasedConstructorAutoMapping(ResultSetWrapper rsw, Re
     return foundValues;
   }
 
+  private boolean columnMatchesParam(String columnName, String paramName, String columnPrefix) {
+    if (columnPrefix != null) {
+      if (!columnName.toUpperCase(Locale.ENGLISH).startsWith(columnPrefix)) {
+        return false;
+      }
+      columnName = columnName.substring(columnPrefix.length());
+    }
+    return paramName
+        .equalsIgnoreCase(configuration.isMapUnderscoreToCamelCase() ? columnName.replace("_", "") : columnName);
+  }
+
   private Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix) throws SQLException {
     final Class<?> resultType = resultMap.getType();
     final String columnName;

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/ArgNameBasedConstructorAutoMappingTest.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.
@@ -123,4 +123,16 @@ void shouldRespectMapUnderscoreToCamelCaseSetting() {
       assertEquals("User1", user.getName());
     }
   }
+
+  @Test
+  void shouldApplyColumnPrefix() {
+    sqlSessionFactory.getConfiguration().setMapUnderscoreToCamelCase(true);
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      Task task = mapper.selectTask(11);
+      assertEquals(Integer.valueOf(1), task.getAssignee().getId());
+      assertEquals("User1!", task.getAssignee().getName());
+      assertEquals(99, task.getAssignee().getTeam());
+    }
+  }
 }

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/CreateDB.sql

@@ -1,5 +1,5 @@
 --
---    Copyright 2009-2021 the original author or authors.
+--    Copyright 2009-2022 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.
@@ -24,3 +24,14 @@ create table users (
 
 insert into users (id, name, team) values
 (1, 'User1', 99);
+
+drop table tasks if exists;
+
+create table tasks (
+  id int,
+  name varchar(20),
+  assignee_id int
+);
+
+insert into tasks (id, name, assignee_id) values
+(11, 'Task1', 1);

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/Mapper.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.
@@ -33,4 +33,6 @@ public interface Mapper {
 
   @Select("select name user_name, id user_id from users where id = #{id}")
   User2 selectUserIdAndUserNameUnderscore(Integer id);
+
+  Task selectTask(Integer id);
 }

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/Mapper.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+       Copyright 2009-2022 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
+
+          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.
+
+-->
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper
+  namespace="org.apache.ibatis.submitted.arg_name_baesd_constructor_automapping.Mapper">
+
+  <resultMap
+    type="org.apache.ibatis.submitted.arg_name_baesd_constructor_automapping.Task"
+    id="taskRM">
+    <association property="assignee" resultMap="userRM"
+      columnPrefix="u_" />
+  </resultMap>
+
+  <resultMap autoMapping="true"
+    type="org.apache.ibatis.submitted.arg_name_baesd_constructor_automapping.User"
+    id="userRM">
+  </resultMap>
+
+  <select id="selectTask" resultMap="taskRM"><![CDATA[
+    select t.id, t.name, u.name u_name, u.team u_team, u.id u_id
+    from tasks t left join users u on u.id = t.assignee_id
+    where t.id = #{id}
+  ]]></select>
+
+</mapper>

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/Task.java

@@ -0,0 +1,46 @@
+/*
+ *    Copyright 2009-2022 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
+ *
+ *       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 org.apache.ibatis.submitted.arg_name_baesd_constructor_automapping;
+
+import org.apache.ibatis.annotations.Param;
+
+public class Task {
+  private final Integer id;
+  private final String name;
+  private User assignee;
+
+  public Task(@Param("id") Integer id, @Param("name") String name) {
+    super();
+    this.id = id;
+    this.name = name;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public User getAssignee() {
+    return assignee;
+  }
+
+  public void setAssignee(User assignee) {
+    this.assignee = assignee;
+  }
+}

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/User.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.

src/test/java/org/apache/ibatis/submitted/arg_name_baesd_constructor_automapping/User2.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2021 the original author or authors.
+ *    Copyright 2009-2022 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.