From 08153f65310511113daa80ccea8c5b0a248f98a9 Mon Sep 17 00:00:00 2001
From: luozongle01 <luozongle@hotmail.com>
Date: Sun, 5 Jan 2025 14:55:31 +0800
Subject: [PATCH 1/6] Update configuration setting to change case Update
 Chinese translation of autoMappingUnknownColumnBehavior

---
 src/site/es/xdoc/configuration.xml    | 10 +++++-----
 src/site/ja/xdoc/configuration.xml    | 10 +++++-----
 src/site/ko/xdoc/configuration.xml    | 10 +++++-----
 src/site/markdown/configuration.md    |  8 ++++----
 src/site/zh_CN/xdoc/configuration.xml | 12 ++++++------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/site/es/xdoc/configuration.xml b/src/site/es/xdoc/configuration.xml
index f9f74c769e2..eb3d954d00a 100644
--- a/src/site/es/xdoc/configuration.xml
+++ b/src/site/es/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2024 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.
@@ -220,7 +220,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -323,7 +323,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -338,7 +338,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                True
+                true
               </td>
             </tr>
             <tr>
@@ -351,7 +351,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
diff --git a/src/site/ja/xdoc/configuration.xml b/src/site/ja/xdoc/configuration.xml
index 79a1746b6c0..c1a831a2b4f 100644
--- a/src/site/ja/xdoc/configuration.xml
+++ b/src/site/ja/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2024 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.
@@ -240,7 +240,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -354,7 +354,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -369,7 +369,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                True
+                true
               </td>
             </tr>
             <tr>
@@ -383,7 +383,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
diff --git a/src/site/ko/xdoc/configuration.xml b/src/site/ko/xdoc/configuration.xml
index 5cff3387eec..9ddfb06cee7 100644
--- a/src/site/ko/xdoc/configuration.xml
+++ b/src/site/ko/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2024 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.
@@ -214,7 +214,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -334,7 +334,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -349,7 +349,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                True
+                true
               </td>
             </tr>
             <tr>
@@ -363,7 +363,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
diff --git a/src/site/markdown/configuration.md b/src/site/markdown/configuration.md
index c5313c8d404..f6eac03b22e 100644
--- a/src/site/markdown/configuration.md
+++ b/src/site/markdown/configuration.md
@@ -110,16 +110,16 @@ These are extremely important tweaks that modify the way that MyBatis behaves at
 | aggressiveLazyLoading              | When enabled, any method call will load all the lazy properties of the object. Otherwise, each property is loaded on demand (see also `lazyLoadTriggerMethods`).                                                                                                                                                                                                                                                                                 | true &#124; false                                                                                                                          | false (true in ≤3.4.1)                                |
 | ~~multipleResultSetsEnabled~~    | Deprecated. This option has no effect.                                                                                                                                                                                                                                                                                                                                     | true &#124; false                                                                                                                          | true                                                  |
 | useColumnLabel                     | Uses the column label instead of the column name. Different drivers behave differently in this respect. Refer to the driver documentation, or test out both modes to determine how your driver behaves.                                                                                                                                                                                                                                          | true &#124; false                                                                                                                          | true                                                  |
-| useGeneratedKeys                   | Allows JDBC support for generated keys. A compatible driver is required. This setting forces generated keys to be used if set to true, as some drivers deny compatibility but still work (e.g. Derby).                                                                                                                                                                                                                                           | true &#124; false                                                                                                                          | False                                                 |
+| useGeneratedKeys                   | Allows JDBC support for generated keys. A compatible driver is required. This setting forces generated keys to be used if set to true, as some drivers deny compatibility but still work (e.g. Derby).                                                                                                                                                                                                                                           | true &#124; false                                                                                                                          | false                                                 |
 | autoMappingBehavior                | Specifies if and how MyBatis should automatically map columns to fields/properties. NONE disables auto-mapping. PARTIAL will only auto-map results with no nested result mappings defined inside. FULL will auto-map result mappings of any complexity (containing nested or otherwise).                                                                                                                                                         | NONE, PARTIAL, FULL                                                                                                                        | PARTIAL                                               |
 | autoMappingUnknownColumnBehavior   | Specify the behavior when detects an unknown column (or unknown property type) of automatic mapping target.<ul><li>`NONE`: Do nothing</li><li>`WARNING`: Output warning log (The log level of `'org.apache.ibatis.session.AutoMappingUnknownColumnBehavior'` must be set to `WARN`)</li><li>`FAILING`: Fail mapping (Throw `SqlSessionException`)</li></ul>Note that there could be false-positives when `autoMappingBehavior` is set to `FULL`. | NONE, WARNING, FAILING                                                                                                                     | NONE                                                  |
 | defaultExecutorType                | Configures the default executor. SIMPLE executor does nothing special. REUSE executor reuses prepared statements. BATCH executor reuses statements and batches updates.                                                                                                                                                                                                                                                                          | SIMPLE REUSE BATCH                                                                                                                         | SIMPLE                                                |
 | defaultStatementTimeout            | Sets the number of seconds the driver will wait for a response from the database.                                                                                                                                                                                                                                                                                                                                                                | Any positive integer                                                                                                                       | Not Set (null)                                        |
 | defaultFetchSize                   | Sets the driver a hint as to control fetching size for return results. This parameter value can be override by a query setting.                                                                                                                                                                                                                                                                                                                  | Any positive integer                                                                                                                       | Not Set (null)                                        |
 | defaultResultSetType               | Specifies a scroll strategy when omit it per statement settings. (Since: 3.5.2)                                                                                                                                                                                                                                                                                                                                                                  | FORWARD_ONLY &#124; SCROLL_SENSITIVE &#124; SCROLL_INSENSITIVE &#124; DEFAULT(same behavior with 'Not Set')                                | Not Set (null)                                        |
-| safeRowBoundsEnabled               | Allows using RowBounds on nested statements. If allow, set the false.                                                                                                                                                                                                                                                                                                                                                                            | true &#124; false                                                                                                                          | False                                                 |
-| safeResultHandlerEnabled           | Allows using ResultHandler on nested statements. If allow, set the false.                                                                                                                                                                                                                                                                                                                                                                        | true &#124; false                                                                                                                          | True                                                  |
-| mapUnderscoreToCamelCase           | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn.                                                                                                                                                                                                                                                                                                                         | true &#124; false                                                                                                                          | False                                                 |
+| safeRowBoundsEnabled               | Allows using RowBounds on nested statements. If allow, set the false.                                                                                                                                                                                                                                                                                                                                                                            | true &#124; false                                                                                                                          | false                                                 |
+| safeResultHandlerEnabled           | Allows using ResultHandler on nested statements. If allow, set the false.                                                                                                                                                                                                                                                                                                                                                                        | true &#124; false                                                                                                                          | true                                                  |
+| mapUnderscoreToCamelCase           | Enables automatic mapping from classic database column names A_COLUMN to camel case classic Java property names aColumn.                                                                                                                                                                                                                                                                                                                         | true &#124; false                                                                                                                          | false                                                 |
 | localCacheScope                    | MyBatis uses local cache to prevent circular references and speed up repeated nested queries. By default (SESSION) all queries executed during a session are cached. If localCacheScope=STATEMENT local session will be used just for statement execution, no data will be shared between two different calls to the same SqlSession.                                                                                                            | SESSION &#124; STATEMENT                                                                                                                   | SESSION                                               |
 | jdbcTypeForNull                    | Specifies the JDBC type for null values when no specific JDBC type was provided for the parameter. Some drivers require specifying the column JDBC type but others work with generic values like NULL, VARCHAR or OTHER.                                                                                                                                                                                                                         | JdbcType enumeration. Most common are: NULL, VARCHAR and OTHER                                                                             | OTHER                                                 |
 | lazyLoadTriggerMethods             | Specifies which Object's methods trigger a lazy load                                                                                                                                                                                                                                                                                                                                                                                             | A method name list separated by commas                                                                                                     | equals,clone,hashCode,toString                        |
diff --git a/src/site/zh_CN/xdoc/configuration.xml b/src/site/zh_CN/xdoc/configuration.xml
index e4671002bd0..93c4cdde308 100644
--- a/src/site/zh_CN/xdoc/configuration.xml
+++ b/src/site/zh_CN/xdoc/configuration.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2024 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.
@@ -231,7 +231,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -263,7 +263,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                   的日志等级必须设置为 <code>WARN</code>）</li>
                   <li><code>FAILING</code>: 映射失败 (抛出 <code>SqlSessionException</code>)</li>
                 </ul>
-                Note that there could be false-positives when `autoMappingBehavior` is set to `FULL`.
+                请注意，当<code>autoMappingBehavior</code>设置为<code>FULL</code>时，可能会出现误报。
               </td>
               <td>
                 NONE, WARNING, FAILING
@@ -342,7 +342,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>
@@ -356,7 +356,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                True
+                true
               </td>
             </tr>
             <tr>
@@ -371,7 +371,7 @@ SqlSessionFactory factory = new SqlSessionFactoryBuilder().build(reader, environ
                 true | false
               </td>
               <td>
-                False
+                false
               </td>
             </tr>
             <tr>

From 60c70d26b1e924fc792a51713cb7edc1256bc7b6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 5 Jan 2025 22:26:53 +0000
Subject: [PATCH 2/6] chore(deps): update dependency
 ch.qos.logback:logback-classic to v1.5.16

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fe21fab2fe7..e23cd467a32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,7 +304,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.5.15</version>
+      <version>1.5.16</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 0a67b48e743dd5ff95dfcbbf8b819ba16fc7dc19 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:05:02 +0000
Subject: [PATCH 3/6] chore(deps): update dependency ognl:ognl to v3.4.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e23cd467a32..b803ab0655c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>ognl</groupId>
       <artifactId>ognl</artifactId>
-      <version>3.4.4</version>
+      <version>3.4.5</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>

From 14f0f5d285fd9bfa09615f258afcc29847757d19 Mon Sep 17 00:00:00 2001
From: Iwao AVE! <harawata@gmail.com>
Date: Tue, 7 Jan 2025 04:40:44 +0900
Subject: [PATCH 4/6] `resultMap.hasResultMapsUsingConstructorCollection`
 should stay false if type handler is specified

---
 src/main/java/org/apache/ibatis/mapping/ResultMap.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/ibatis/mapping/ResultMap.java b/src/main/java/org/apache/ibatis/mapping/ResultMap.java
index 58ce5dd6f6a..a7c8ebe494a 100644
--- a/src/main/java/org/apache/ibatis/mapping/ResultMap.java
+++ b/src/main/java/org/apache/ibatis/mapping/ResultMap.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2024 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.
@@ -116,7 +116,7 @@ public ResultMap build() {
           // #101
           Class<?> javaType = resultMapping.getJavaType();
           resultMap.hasResultMapsUsingConstructorCollection = resultMap.hasResultMapsUsingConstructorCollection
-              || (resultMapping.getNestedQueryId() == null && javaType != null
+              || (resultMapping.getNestedQueryId() == null && resultMapping.getTypeHandler() == null && javaType != null
                   && resultMap.configuration.getObjectFactory().isCollection(javaType));
 
           if (resultMapping.getProperty() != null) {

From 2de25069875061db3ea7435a083d86c1e6f9e012 Mon Sep 17 00:00:00 2001
From: Iwao AVE! <harawata@gmail.com>
Date: Tue, 7 Jan 2025 05:01:04 +0900
Subject: [PATCH 5/6] ojdbc8 -> ojdbc11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b803ab0655c..3ae32a90691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -206,7 +206,7 @@
     </dependency>
     <dependency>
       <groupId>com.oracle.database.jdbc</groupId>
-      <artifactId>ojdbc8</artifactId>
+      <artifactId>ojdbc11</artifactId>
       <version>23.6.0.24.10</version>
       <scope>test</scope>
     </dependency>

From 640b93015659287955ec4cfdfa70bfafc2b025a8 Mon Sep 17 00:00:00 2001
From: Willie Scholtz <williescholtz@gmail.com>
Date: Tue, 7 Jan 2025 10:47:41 +0100
Subject: [PATCH 6/6] Add additional test with mix of nested result map and
 type handler

---
 .../CollectionInConstructorTest.java          | 30 ++++++--
 .../collection_in_constructor/Mapper.java     |  1 +
 .../collection_in_constructor/Store10.java    | 69 +++++++++++++++++++
 .../collection_in_constructor/Mapper.xml      | 26 +++++++
 4 files changed, 121 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store10.java

diff --git a/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorTest.java b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorTest.java
index 20aa7db18b2..6267f9af13c 100644
--- a/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorTest.java
+++ b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/CollectionInConstructorTest.java
@@ -15,6 +15,9 @@
  */
 package org.apache.ibatis.submitted.collection_in_constructor;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.tuple;
+
 import java.io.Reader;
 import java.util.Arrays;
 import java.util.Collections;
@@ -164,6 +167,23 @@ void testCollectionArgWithTypeHandler() {
     }
   }
 
+  @Test
+  void testCollectionArgWithNestedAndTypeHandler() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Mapper mapper = sqlSession.getMapper(Mapper.class);
+      List<Store10> stores10 = mapper.getStores10();
+
+      assertThat(stores10).isNotNull().hasSize(3)
+          .extracting(Store10::getId, Store10::getName, store -> store.getClerks().size(), Store10::getStrings)
+          .containsExactly(tuple(1, "Store 1", 5, List.of("a", "b", "c", "1")),
+              tuple(2, "Store 2", 0, List.of("a", "b", "c", "2")), tuple(3, "Store 3", 0, List.of("a", "b", "c", "3")));
+
+      assertThat(stores10.get(0).getClerks()).extracting(Clerk::getId, Clerk::getName).containsExactly(
+          tuple(1001, "Clerk 1001"), tuple(1002, "Clerk 1002"), tuple(1003, "Clerk 1003"), tuple(1004, "Clerk 1004"),
+          tuple(1005, "Clerk 1005"));
+    }
+  }
+
   @Test
   void testImmutableNestedObjects() {
     try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
@@ -203,17 +223,17 @@ void testImmutableNestedObjectsWithBadEquals() {
           new Store9(1, "Store 1", Arrays.asList(new Clerk(1002, "Clerk 1002"), new Clerk(1005, "Clerk 1005")))));
 
       // cannot use direct equals as we overwrote it with a bad impl on purpose
-      org.assertj.core.api.Assertions.assertThat(containers).isNotNull().hasSize(2);
+      assertThat(containers).isNotNull().hasSize(2);
       assertContainer1(containers.get(0), expectedContainer1);
       assertContainer1(containers.get(1), expectedContainer2);
     }
   }
 
   private static void assertContainer1(Container1 container1, Container1 expectedContainer1) {
-    org.assertj.core.api.Assertions.assertThat(container1).isNotNull().satisfies(c -> {
-      org.assertj.core.api.Assertions.assertThat(c.getNum()).isEqualTo(expectedContainer1.getNum());
-      org.assertj.core.api.Assertions.assertThat(c.getType()).isEqualTo(expectedContainer1.getType());
-      org.assertj.core.api.Assertions.assertThat(c.getStores()).isEqualTo(expectedContainer1.getStores());
+    assertThat(container1).isNotNull().satisfies(c -> {
+      assertThat(c.getNum()).isEqualTo(expectedContainer1.getNum());
+      assertThat(c.getType()).isEqualTo(expectedContainer1.getType());
+      assertThat(c.getStores()).isEqualTo(expectedContainer1.getStores());
     });
   }
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Mapper.java b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Mapper.java
index 0aa4db76a2e..79e36371c4a 100644
--- a/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Mapper.java
+++ b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Mapper.java
@@ -41,4 +41,5 @@ public interface Mapper {
 
   List<Container1> getContainers();
 
+  List<Store10> getStores10();
 }
diff --git a/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store10.java b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store10.java
new file mode 100644
index 00000000000..48041dd8ed6
--- /dev/null
+++ b/src/test/java/org/apache/ibatis/submitted/collection_in_constructor/Store10.java
@@ -0,0 +1,69 @@
+/*
+ *    Copyright 2009-2024 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.collection_in_constructor;
+
+import java.util.List;
+import java.util.Objects;
+
+public class Store10 {
+
+  private final Integer id;
+  private final String name;
+  private final List<Clerk> clerks;
+  private final List<String> strings;
+
+  public Store10(Integer id, String name, List<Clerk> clerks, List<String> strings) {
+    this.id = id;
+    this.name = name;
+    this.clerks = clerks;
+    this.strings = strings;
+  }
+
+  public Integer getId() {
+    return id;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public List<Clerk> getClerks() {
+    return clerks;
+  }
+
+  public List<String> getStrings() {
+    return strings;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass())
+      return false;
+    Store10 store10 = (Store10) o;
+    return Objects.equals(id, store10.id) && Objects.equals(name, store10.name)
+        && Objects.equals(clerks, store10.clerks) && Objects.equals(strings, store10.strings);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name, clerks, strings);
+  }
+
+  @Override
+  public String toString() {
+    return "Store10{" + "id=" + id + ", name='" + name + '\'' + ", clerks=" + clerks + ", strings=" + strings + '}';
+  }
+}
diff --git a/src/test/resources/org/apache/ibatis/submitted/collection_in_constructor/Mapper.xml b/src/test/resources/org/apache/ibatis/submitted/collection_in_constructor/Mapper.xml
index 47aa2887c88..9ee9697c80d 100644
--- a/src/test/resources/org/apache/ibatis/submitted/collection_in_constructor/Mapper.xml
+++ b/src/test/resources/org/apache/ibatis/submitted/collection_in_constructor/Mapper.xml
@@ -277,4 +277,30 @@
     order by type, s.id, c.id
   ]]></select>
 
+  <resultMap
+          type="org.apache.ibatis.submitted.collection_in_constructor.Store10"
+          id="store10RM">
+    <constructor>
+      <idArg column="id" javaType="int" />
+      <arg column="name" javaType="string" />
+      <arg javaType="list" resultMap="immutableClerkRM" columnPrefix="clerk_" />
+      <arg column="csv" javaType="list"
+           typeHandler="org.apache.ibatis.submitted.collection_in_constructor.CsvToListTypeHandler" />
+    </constructor>
+  </resultMap>
+
+  <select id="getStores10" resultMap="store10RM"
+          resultOrdered="true"><![CDATA[
+    select
+      s.id,
+      s.name,
+      c.id clerk_id, c.name clerk_name,
+      i.id aisle_id, i.name aisle_name,
+      CONCAT('a,b,c,', s.id) csv
+    from store s
+    left join clerk c on c.store_id = s.id
+    left join aisle i on i.store_id = s.id
+    order by s.id, c.id, i.id
+  ]]></select>
+
 </mapper>