diff --git a/hutool-db/pom.xml b/hutool-db/pom.xml index a00d52d9e..897bec82a 100755 --- a/hutool-db/pom.xml +++ b/hutool-db/pom.xml @@ -35,10 +35,10 @@ 2.9.0 10.0.27 - 1.2.16 + 1.2.17 4.0.3 - 3.39.4.1 + 3.41.2.1 2.5.2 @@ -94,7 +94,7 @@ com.github.chris2018998 beecp - 3.4.0 + 3.4.1 slf4j-api @@ -132,19 +132,19 @@ mysql mysql-connector-java - 8.0.30 + 8.0.32 test org.postgresql postgresql - 42.5.0 + 42.6.0 test com.microsoft.sqlserver mssql-jdbc - 11.2.1.jre8 + 12.2.0.jre8 test diff --git a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java index 3620433e7..9cb247686 100644 --- a/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java +++ b/hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java @@ -74,7 +74,7 @@ public class DruidDSFactory extends AbstractDSFactory { // Druid连接池配置信息,规范化属性名 final Props druidProps = new Props(); poolSetting.forEach((key, value)-> druidProps.put(StrUtil.addPrefixIfNot(key, "druid."), value)); - ds.configFromPropety(druidProps); + ds.configFromPropeties(druidProps); //issue#I4ZKCW 某些非属性设置单独设置 // connectionErrorRetryAttempts diff --git a/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java index 2df53bdb2..a3c3a6871 100644 --- a/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java +++ b/hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java @@ -21,8 +21,6 @@ public class DialectFactoryTest { map.put("sqlite",DRIVER_SQLLITE3); map.put("sqlserver",DRIVER_SQLSERVER); map.put("microsoft",DRIVER_SQLSERVER); - map.put("hive2",DRIVER_HIVE2); - map.put("hive",DRIVER_HIVE); map.put("h2",DRIVER_H2); map.put("derby",DRIVER_DERBY); map.put("hsqldb",DRIVER_HSQLDB); @@ -40,6 +38,9 @@ public class DialectFactoryTest { map.put("sybase",DRIVER_SYBASE); map.put("mariadb",DRIVER_MARIADB); + // 单元测试歧义 + //map.put("hive2",DRIVER_HIVE2); + //map.put("hive",DRIVER_HIVE); map.forEach((k,v) -> Assertions.assertEquals(v, DialectFactory.identifyDriver(k+ RandomUtil.randomString(2),null) ));