A test case that shows how namespace is resolved in a nested include

Several users reported this behavior as a bug, but it is by design. #2590 #3246 #3306
mybatis · Dec 1, 2024 · 66a96f5 · 66a96f5
1 parent 4a6c025
commit 66a96f5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java b/src/test/java/org/apache/ibatis/submitted/includes/IncludeTest.java
@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    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.
@@ -57,4 +57,10 @@ void testParametrizedIncludes() {
     }
   }
 
+  @Test
+  void shouldNamespaceBeResolvedAfterIncluded() {
+    try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
+      Assertions.assertNotNull(sqlSession.selectList("org.apache.ibatis.submitted.includes.mapper.selectIds"));
+    }
+  }
 }
diff --git a/src/test/resources/org/apache/ibatis/submitted/includes/Fragments.xml b/src/test/resources/org/apache/ibatis/submitted/includes/Fragments.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2023 the original author or authors.
+       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.
@@ -30,4 +30,8 @@
   <sql id="values">
     VALUES (1);
   </sql>
+  <sql id="selectId">
+    select id from
+    <include refid="tableName" />
+  </sql>
 </mapper>
diff --git a/src/test/resources/org/apache/ibatis/submitted/includes/Mapper.xml b/src/test/resources/org/apache/ibatis/submitted/includes/Mapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-       Copyright 2009-2022 the original author or authors.
+       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.
@@ -24,6 +24,9 @@
   <sql id="sometable">
     ${prefix}Table
   </sql>
+  <sql id="tableName">
+    SomeTable
+  </sql>
 
   <sql id="someinclude">
     <include refid="${include_target}"/>
@@ -54,4 +57,8 @@
     Field3 = #{field3,jdbcType=VARCHAR},
     where field1 = #{field1,jdbcType=INTEGER}
   </update>
+
+  <select id="selectIds" resultType="int">
+    <include refid="org.apache.ibatis.submitted.includes.fragments.selectId"/>
+  </select>
 </mapper>