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

update datasource to "dataSource"

Browse Source
This commit is contained in:
开源海哥 2023-04-28 16:29:43 +08:00
parent f636bb53d1
commit a86551633c
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/BaseQueryWrapper.java
View File

@ -22,7 +22,7 @@ public class BaseQueryWrapper<T> implements Serializable {
protected List<QueryTable> queryTables;
protected String datasource;
protected String dataSource;
protected List<QueryColumn> selectColumns;
protected List<Join> joins;
@ -126,12 +126,12 @@ public class BaseQueryWrapper<T> implements Serializable {
this.queryTables = queryTables;
}
protected String getDatasource() {
return datasource;
protected String getDataSource() {
return dataSource;
}
protected void setDatasource(String datasource) {
this.datasource = datasource;
protected void setDataSource(String dataSource) {
this.dataSource = dataSource;
}
protected List<QueryColumn> getSelectColumns() {

8
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/CPI.java
View File

@ -47,12 +47,12 @@ public class CPI {
queryWrapper.setQueryTables(queryTables);
}
public static String getDatasource(QueryWrapper queryWrapper) {
return queryWrapper.getDatasource();
public static String getDataSource(QueryWrapper queryWrapper) {
return queryWrapper.getDataSource();
}
public static void setDatasource(QueryWrapper queryWrapper, String datasource) {
queryWrapper.setDatasource(datasource);
public static void setDataSource(QueryWrapper queryWrapper, String datasource) {
queryWrapper.setDataSource(datasource);
}
public static List<QueryColumn> getSelectColumns(QueryWrapper queryWrapper) {

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

@ -339,7 +339,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
}
public QueryWrapper datasource(String datasource) {
setDatasource(datasource);
setDataSource(datasource);
return this;
}

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

@ -129,7 +129,7 @@ public class TransactionalManager {
boolean rollbacked = false;
try {
success = supplier.get();
} catch (Exception e) {
} catch (Throwable e) {
rollbacked = true;
rollback(xid);
throw new TransactionException(e.getMessage(), e);

2
readme.md
View File

@ -53,7 +53,7 @@ class HelloWorld {
dataSource.setPassword("password");
MybatisFlexBootstrap.getInstance()
.setDatasource(dataSource)
.setDataSource(dataSource)
.addMapper(AccountMapper.class)
.start();

2
readme_zh.md
View File

@ -66,7 +66,7 @@ class HelloWorld {
dataSource.setPassword("password");
MybatisFlexBootstrap.getInstance()
.setDatasource(dataSource)
.setDataSource(dataSource)
.addMapper(AccountMapper.class)
.start();