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

build: v1.6.3 release (^.^)YYa!!

Browse Source
This commit is contained in:
开源海哥 2023-09-01 11:13:54 +08:00
parent ebe16f9dc4
commit 09f35cfbd5
16 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-flex-annotation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-codegen/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/FlexConsts.java
View File

@ -27,7 +27,7 @@ public class FlexConsts {
}
public static final String NAME = "MyBatis-Flex";
public static final String VERSION = "1.6.2";
public static final String VERSION = "1.6.3";
public static final String SQL = "$$sql";

18
mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexResultSetHandler.java
View File

@ -65,7 +65,7 @@ public class FlexResultSetHandler extends FlexDefaultResultSetHandler {
/**
* 修复当实体类中存在 List<String> 或者 List<Integer> 等自动映射出错的问题
* 本质问题应该出现 mybatis 判断有误
*
* <p>
* https://gitee.com/mybatis-flex/mybatis-flex/issues/I7XBQS
* https://gitee.com/mybatis-flex/mybatis-flex/issues/I7X7G7
*
@ -78,25 +78,23 @@ public class FlexResultSetHandler extends FlexDefaultResultSetHandler {
protected Object createPrimitiveResultObject(ResultSetWrapper rsw, ResultMap resultMap, String columnPrefix)
throws SQLException {
final Class<?> resultType = resultMap.getType();
final String columnName;
final TypeHandler<?> typeHandler;
if (!resultMap.getResultMappings().isEmpty()) {
final List<ResultMapping> resultMappingList = resultMap.getResultMappings();
final ResultMapping mapping = resultMappingList.get(0);
columnName = prependPrefix(mapping.getColumn(), columnPrefix);
typeHandler = mapping.getTypeHandler();
} else {
columnName = rsw.getColumnNames().get(0);
typeHandler = rsw.getTypeHandler(resultType, columnName);
}
String columnName = prependPrefix(mapping.getColumn(), columnPrefix);
TypeHandler<?> typeHandler = mapping.getTypeHandler();
List<String> mappedColumnNames = rsw.getMappedColumnNames(resultMap, columnPrefix);
if (columnName != null && mappedColumnNames.contains(columnName.toUpperCase(Locale.ENGLISH))) {
return typeHandler.getResult(rsw.getResultSet(), columnName);
}
return null;
} else {
String columnName = rsw.getColumnNames().get(0);
TypeHandler<?> typeHandler = rsw.getTypeHandler(resultType, columnName);
return typeHandler.getResult(rsw.getResultSet(), columnName);
}
}
static class FlexCursor<T> implements Cursor<T> {

2
mybatis-flex-dependencies/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>com.mybatis-flex</groupId>
<artifactId>parent</artifactId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<artifactId>mybatis-flex-dependencies</artifactId>

2
mybatis-flex-processor/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-solon-plugin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-spring-boot-starter/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-spring/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/mybatis-flex-native-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mybatis-flex-test</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/mybatis-flex-seata-test/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mybatis-flex-test</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mybatis-flex-test</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<artifactId>mybatis-flex-test</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/mybatis-flex-spring-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>mybatis-flex-test</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
mybatis-flex-test/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>com.mybatis-flex</groupId>
<version>1.6.2</version>
<version>1.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>