admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix RowMapperInvoker error in dialect

Browse Source
This commit is contained in:
Michael Yang 2025-03-19 18:19:00 +08:00
parent 1987df70a5
commit ecfea5e683
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mybatis-flex-core/src/main/java/com/mybatisflex/core/row/RowMapperInvoker.java
View File

@ -15,6 +15,7 @@
*/ */
package com.mybatisflex.core.row; package com.mybatisflex.core.row;
import com.mybatisflex.core.mybatis.MappedStatementTypes;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.query.QueryWrapper;
import org.apache.ibatis.executor.BatchResult; import org.apache.ibatis.executor.BatchResult;
@ -36,10 +37,21 @@ public class RowMapperInvoker {
this.sqlSessionFactory = sqlSessionFactory; this.sqlSessionFactory = sqlSessionFactory;
} }
private <R> R execute(Function<RowMapper, R> function) { protected <R> R execute(Function<RowMapper, R> function) {
try (SqlSession sqlSession = sqlSessionFactory.openSession(true)) { Class<?> currentType = MappedStatementTypes.getCurrentType();
RowMapper mapper = sqlSession.getMapper(RowMapper.class); if (currentType == null) {
return function.apply(mapper); try (SqlSession sqlSession = sqlSessionFactory.openSession(true)) {
RowMapper mapper = sqlSession.getMapper(RowMapper.class);
return function.apply(mapper);
}
} else {
MappedStatementTypes.clear();
try (SqlSession sqlSession = sqlSessionFactory.openSession(true)) {
RowMapper mapper = sqlSession.getMapper(RowMapper.class);
return function.apply(mapper);
} finally {
MappedStatementTypes.setCurrentType(currentType);
}
} }
} }
@ -115,7 +127,6 @@ public class RowMapperInvoker {
} }
public <M> int[] executeBatch(int totalSize, int batchSize, Class<M> mapperClass, BiConsumer<M, Integer> consumer) { public <M> int[] executeBatch(int totalSize, int batchSize, Class<M> mapperClass, BiConsumer<M, Integer> consumer) {
int[] results = new int[totalSize]; int[] results = new int[totalSize];
try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, true)) { try (SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, true)) {
@ -189,12 +200,15 @@ public class RowMapperInvoker {
public List<Row> selectAll(String schema, String tableName) { public List<Row> selectAll(String schema, String tableName) {
return execute(mapper -> mapper.selectAll(schema, tableName)); return execute(mapper -> mapper.selectAll(schema, tableName));
} }
public Map selectFirstAndSecondColumnsAsMapByQuery(String schema, String tableName, QueryWrapper queryWrapper) { public Map selectFirstAndSecondColumnsAsMapByQuery(String schema, String tableName, QueryWrapper queryWrapper) {
return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper)); return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMapByQuery(schema, tableName, queryWrapper));
} }
public Map selectFirstAndSecondColumnsAsMap(String sql, Object... args) { public Map selectFirstAndSecondColumnsAsMap(String sql, Object... args) {
return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMap(sql, args)); return execute(mapper -> mapper.selectFirstAndSecondColumnsAsMap(sql, args));
} }
public Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) { public Object selectObjectByQuery(String schema, String tableName, QueryWrapper queryWrapper) {
return execute(mapper -> mapper.selectObjectByQuery(schema, tableName, queryWrapper)); return execute(mapper -> mapper.selectObjectByQuery(schema, tableName, queryWrapper));
} }