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

feat: add DataSourceKey.use to support nested usage

Browse Source
This commit is contained in:
Michael Yang 2024-06-02 11:15:32 +08:00
parent c206540bf7
commit e7292f53b4
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,20 +45,30 @@ public class DataSourceKey {
}
public static <T> T use(String dataSourceKey, Supplier<T> supplier) {
String prevKey = manualKeyThreadLocal.get();
try {
use(dataSourceKey);
manualKeyThreadLocal.set(dataSourceKey);
return supplier.get();
} finally {
clear();
if (prevKey != null) {
manualKeyThreadLocal.set(prevKey);
} else {
clear();
}
}
}
public static void use(String dataSourceKey, Runnable runnable) {
String prevKey = manualKeyThreadLocal.get();
try {
use(dataSourceKey);
manualKeyThreadLocal.set(dataSourceKey);
runnable.run();
} finally {
clear();
if (prevKey != null) {
manualKeyThreadLocal.set(prevKey);
} else {
clear();
}
}
}

5
mybatis-flex-test/mybatis-flex-native-test/src/main/java/com/mybatisflex/test/MultiDataSourceTester.java
View File

@ -29,7 +29,6 @@ import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
import javax.sql.DataSource;
import java.util.List;
import java.util.function.Supplier;
public class MultiDataSourceTester {
@ -60,9 +59,9 @@ public class MultiDataSourceTester {
AuditManager.setMessageCollector(collector);
Db.tx(() -> {
Db.selectAll(null, "tb_account");
Db.selectAll("tb_account");
DataSourceKey.use("ds2");
Db.selectAll(null, "tb_account");
Db.selectAll("tb_account");
return true;
});