dromara/dbswitch
1
0
Fork 0
mirror of https://gitee.com/dromara/dbswitch.git synced 2025-09-27 22:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

!63 v1.6.1: Fix Bug

Browse Source 
* 修复db2、sqlserver连接测试
This commit is contained in:
inrgihc
2021-11-16 15:29:05 +00:00
parent 12255c7c4b
commit 0268a4eb3a
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbswitch-admin/src/main/java/com/gitee/dbswitch/admin/type/SupportDbTypeEnum.java
View File

@@ -23,7 +23,7 @@ public enum SupportDbTypeEnum {
"jdbc:mariadb://{host}:{port}/{name}?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&tinyInt1isBit=false"),
ORACLE(3, "oracle", "oracle.jdbc.driver.OracleDriver", "SELECT 'Hello' from DUAL",
"jdbc:oracle:thin:@{host}:{port}:{name}"),
SQLSERVER(4, "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "SELECT 1",
SQLSERVER(4, "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "SELECT 1+2 as a",
"jdbc:sqlserver://{host}:{port};DatabaseName={name}"),
POSTGRESQL(5, "postgresql", "org.postgresql.Driver", "SELECT 1",
"jdbc:postgresql://{host}:{port}/{name}"),

2
dbswitch-core/src/main/java/com/gitee/dbswitch/core/database/impl/DatabaseDB2Impl.java
View File

@@ -43,7 +43,7 @@ public class DatabaseDB2Impl extends AbstractDatabase implements IDatabaseInterf
@Override
protected String getTestQuerySQL(String sql) {
return String.format("explain %s", sql.replace(";", ""));
return String.format("SELECT * FROM ( %s ) t WHERE 1=2 ", sql.replace(";", ""));
}
@Override

4
dbswitch-data/src/main/java/com/gitee/dbswitch/data/util/DataSouceUtils.java
View File

@@ -30,6 +30,8 @@ public final class DataSouceUtils {
ds.setPassword(description.getPassword());
if (description.getDriverClassName().contains("oracle")) {
ds.setConnectionTestQuery("SELECT 'Hello' from DUAL");
} else if (description.getDriverClassName().contains("db2")) {
ds.setConnectionTestQuery("SELECT 1 FROM SYSIBM.SYSDUMMY1");
} else {
ds.setConnectionTestQuery("SELECT 1");
}
@@ -56,6 +58,8 @@ public final class DataSouceUtils {
ds.setPassword(description.getPassword());
if (description.getDriverClassName().contains("oracle")) {
ds.setConnectionTestQuery("SELECT 'Hello' from DUAL");
} else if (description.getDriverClassName().contains("db2")) {
ds.setConnectionTestQuery("SELECT 1 FROM SYSIBM.SYSDUMMY1");
} else {
ds.setConnectionTestQuery("SELECT 1");
}