test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-11-30 18:27:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update MyBatis version #PL-3749

Browse Source
This commit is contained in:
Yuriy Artamonov 2014-07-29 07:54:58 +00:00
parent fb53e7f08c
commit 7c4c94581a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -222,8 +222,8 @@ configure(coreModule) {
compile(group: 'org.jgroups', name: 'jgroups', version: '2.12.1.Final') compile(group: 'org.jgroups', name: 'jgroups', version: '2.12.1.Final')
compile(group: 'org.aspectj', name: 'aspectjrt', version: '1.6.12') compile(group: 'org.aspectj', name: 'aspectjrt', version: '1.6.12')
compile(group: 'org.aspectj', name: 'aspectjweaver', version: '1.6.12') compile(group: 'org.aspectj', name: 'aspectjweaver', version: '1.6.12')
compile(group: 'org.mybatis', name: 'mybatis', version: '3.0.5') compile(group: 'org.mybatis', name: 'mybatis', version: '3.2.7')
compile(group: 'org.mybatis', name: 'mybatis-spring', version: '1.0.1') compile(group: 'org.mybatis', name: 'mybatis-spring', version: '1.2.2')
compile(group: 'org.springframework', name: 'spring-context-support', version: springVersion) compile(group: 'org.springframework', name: 'spring-context-support', version: springVersion)
compile(group: 'org.springframework', name: 'spring-orm', version: springVersion) compile(group: 'org.springframework', name: 'spring-orm', version: springVersion)
compile(group: 'org.springframework', name: 'spring-tx', version: springVersion) compile(group: 'org.springframework', name: 'spring-tx', version: springVersion)

20
modules/core/src/com/haulmont/cuba/core/sys/mybatis/UUIDTypeHandler.java
View File

@ -25,18 +25,30 @@ public class UUIDTypeHandler implements TypeHandler {
@Override @Override
public Object getResult(ResultSet rs, String columnName) throws SQLException { public Object getResult(ResultSet rs, String columnName) throws SQLException {
String val = rs.getString(columnName); String val = rs.getString(columnName);
if (val != null) if (val != null) {
return UuidProvider.fromString(val); return UuidProvider.fromString(val);
else } else {
return null; return null;
}
}
@Override
public Object getResult(ResultSet rs, int columnIndex) throws SQLException {
String val = rs.getString(columnIndex);
if (val != null) {
return UuidProvider.fromString(val);
} else {
return null;
}
} }
@Override @Override
public Object getResult(CallableStatement cs, int columnIndex) throws SQLException { public Object getResult(CallableStatement cs, int columnIndex) throws SQLException {
String val = cs.getString(columnIndex); String val = cs.getString(columnIndex);
if (val != null) if (val != null) {
return UuidProvider.fromString(val); return UuidProvider.fromString(val);
else } else {
return null; return null;
}
} }
} }