Skip to content

修复了动态sqlSource不能自动映射的问题。 #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.3.x
Choose a base branch
from
Open

修复了动态sqlSource不能自动映射的问题。 #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 35 additions & 33 deletions base/src/test/java/tk/mybatis/mapper/rawresultmap/RawResultMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import java.io.IOException;
import java.io.Reader;
import java.net.URL;
import java.util.Arrays;
import java.util.List;

/**
Expand Down Expand Up @@ -45,55 +46,56 @@ public void testSelect() {

System.out.println("------selectAll------");
users = mapper.selectAll();
users.forEach(u -> {
System.out.println(u);
Assert.assertNotNull(u.getUname());
Assert.assertNotNull(u.getAge());
Assert.assertNotNull(u.getCreateTime());
Assert.assertNull(u.getEmail());
});
System.out.println("------------");
userAssert(users);
System.out.println("###################");

System.out.println("------selectRawAnnotation------");
users = mapper.selectRawAnnotation();
users.forEach(u -> {
System.out.println(u);
Assert.assertNotNull(u.getUname());
Assert.assertNotNull(u.getAge());
Assert.assertNotNull(u.getCreateTime());
Assert.assertNotNull(u.getEmail());
});
System.out.println("------------");
userAssert(users);
System.out.println("###################");

System.out.println("------selectRawAnnotationResultMap------");
users = mapper.selectRawAnnotationResultMap();
userAssert(users);
System.out.println("###################");

System.out.println("------fetchRawResultMap------");
users = mapper.fetchRawResultMap();
users.forEach(u -> {
System.out.println(u);
Assert.assertNotNull(u.getUname());
Assert.assertNotNull(u.getAge());
Assert.assertNotNull(u.getCreateTime());
Assert.assertNotNull(u.getEmail());
});
System.out.println("------------");
userAssert(users);
System.out.println("###################");

System.out.println("------fetchDynamicResultMap------");
users = mapper.fetchDynamicResultMap();
userAssert(users);
System.out.println("###################");

System.out.println("------fetchRawResultType------");
users = mapper.fetchRawResultType();
users.forEach(u -> {
System.out.println(u);
Assert.assertNotNull(u.getUname());
Assert.assertNotNull(u.getAge());
Assert.assertNotNull(u.getCreateTime());
Assert.assertNotNull(u.getEmail());
});
System.out.println("------------");
userAssert(users);
System.out.println("###################");

System.out.println("------fetchDynamicSqlType------");
users = mapper.fetchDynamicSqlType(Arrays.asList(1, 2, 3));
userAssert(users);
System.out.println("###################");

System.out.println("------getMapUser------");
System.out.println(mapper.getMapUser());
System.out.println("------------");
System.out.println("###################");

System.out.println(mapper.selectCount2());

} finally {
sqlSession.close();
}
}

private static void userAssert(List<User> users) {
users.forEach(u -> {
System.out.println(u);
Assert.assertNotNull(u.getUname());
Assert.assertNotNull(u.getAge());
Assert.assertNotNull(u.getCreateTime());
});
}
}
10 changes: 10 additions & 0 deletions base/src/test/java/tk/mybatis/mapper/rawresultmap/UserMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package tk.mybatis.mapper.rawresultmap;

import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Select;
import tk.mybatis.mapper.common.BaseMapper;

Expand All @@ -15,10 +17,18 @@ public interface UserMapper extends BaseMapper<User> {
@Select("SELECT * FROM user")
List<User> selectRawAnnotation();

@Select("SELECT * FROM user")
@ResultMap("BaseResultMap")
List<User> selectRawAnnotationResultMap();

List<User> fetchRawResultType();

List<User> fetchDynamicSqlType(@Param("ids") List<Integer> ids);

List<User> fetchRawResultMap();

List<User> fetchDynamicResultMap();

Map<String, Object> getMapUser();

Integer selectCount2();
Expand Down
22 changes: 21 additions & 1 deletion base/src/test/java/tk/mybatis/mapper/rawresultmap/UserMapper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,38 @@
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="user_name" jdbcType="VARCHAR" property="uname" />
<result column="email" jdbcType="VARCHAR" property="email" />
<result column="age____aa" jdbcType="INTEGER" property="age" />
<result column="age__int__aa" jdbcType="INTEGER" property="age" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>

<select id="fetchRawResultType" resultType = "tk.mybatis.mapper.rawresultmap.User">
select * from user
</select>

<select id="fetchDynamicSqlType" resultType = "tk.mybatis.mapper.rawresultmap.User">
select * from user
<where>
<if test="ids != null and ids.size() != 0">
id
<foreach collection="ids" open="in (" close=")" separator="," item="id">
#{id}
</foreach>
</if>
</where>
</select>

<select id="fetchRawResultMap" resultMap="BaseResultMap">
select * from user
</select>

<select id="fetchDynamicResultMap" resultMap="BaseResultMap">
select * from user
<where>
1=1
</where>
</select>


<select id="getMapUser" resultType="Map">
select * from user where id = 1
</select>
Expand Down
47 changes: 22 additions & 25 deletions core/src/main/java/tk/mybatis/mapper/mapperhelper/MapperHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.mapping.ResultMap;
import org.apache.ibatis.mapping.ResultMapping;
import org.apache.ibatis.mapping.SqlCommandType;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.scripting.defaults.RawSqlSource;
import org.apache.ibatis.session.Configuration;
import tk.mybatis.mapper.MapperException;
import tk.mybatis.mapper.annotation.RegisterMapper;
Expand Down Expand Up @@ -303,11 +303,27 @@ public void processMappedStatement(MappedStatement ms) {
setSqlSource(ms, mapperTemplate);
}

// 如果是原生mybatisSqlSource的查询，添加ResultMap
if (ms.getSqlSource() instanceof RawSqlSource
&& ms.getSqlCommandType() == SqlCommandType.SELECT) {
if (ms.getResultMaps() != null && !ms.getResultMaps().isEmpty()) {
setRawSqlSourceMapper(ms);
// 如果没有resultMaps, 有则设置一个默认的resultMaps
if (ms.getSqlCommandType() == SqlCommandType.SELECT) {
List<ResultMap> resultMaps = ms.getResultMaps();
if (resultMaps != null) {
List<ResultMap> modifiableResultMaps = new ArrayList<>(resultMaps);
for (int i = 0; i < resultMaps.size(); i++) {
List<ResultMapping> mappings = resultMaps.get(i).getResultMappings();
// 只有type，没有mappings的情况下
if (mappings == null || mappings.isEmpty()) {
EntityTable entityTable = EntityHelper.getEntityTableOrNull(resultMaps.get(i).getType());
// 如果有@Table注解，则可以获取到entityTable
if (entityTable != null) {
ResultMap resultMap = entityTable.getResultMap(ms.getConfiguration());
if (resultMap != null) {
modifiableResultMaps.set(i, resultMap);
MetaObject metaObject = MetaObjectUtil.forObject(ms);
metaObject.setValue("resultMaps", Collections.unmodifiableList(modifiableResultMaps));
}
}
}
}
}
}
}
Expand Down Expand Up @@ -396,23 +412,4 @@ public void setSqlSource(MappedStatement ms, MapperTemplate mapperTemplate) {
}
}

/**
* 设置原生Mybatis查询的实体映射，
* </p>
* JPA的注解优先级将高于mybatis自动映射
*/
public void setRawSqlSourceMapper(MappedStatement ms) {

EntityTable entityTable = EntityHelper.getEntityTableOrNull(ms.getResultMaps().get(0).getType());
if (entityTable != null) {
List<ResultMap> resultMaps = new ArrayList<>();
ResultMap resultMap = entityTable.getResultMap(ms.getConfiguration());
if (resultMap != null) {
resultMaps.add(resultMap);
MetaObject metaObject = MetaObjectUtil.forObject(ms);
metaObject.setValue("resultMaps", Collections.unmodifiableList(resultMaps));
}
}
}

}