ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-04-14 02:01:53 +08:00
parent eb00ed76de
commit 55ee4298e9
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hutool-db/pom.xml
View File

@ -35,10 +35,10 @@
<dbcp2.version>2.9.0</dbcp2.version>
<!-- 固定10.0.x -->
<tomcat-jdbc.version>10.0.27</tomcat-jdbc.version>
<druid.version>1.2.16</druid.version>
<druid.version>1.2.17</druid.version>
<!-- 固定4.x -->
<hikariCP.version>4.0.3</hikariCP.version>
<sqlite.version>3.39.4.1</sqlite.version>
<sqlite.version>3.41.2.1</sqlite.version>
<!-- 此处固定2.5.x，支持到JDK8 -->
<hsqldb.version>2.5.2</hsqldb.version>
</properties>
@ -94,7 +94,7 @@
<dependency>
<groupId>com.github.chris2018998</groupId>
<artifactId>beecp</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@ -132,19 +132,19 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.30</version>
<version>8.0.32</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.5.0</version>
<version>42.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>11.2.1.jre8</version>
<version>12.2.0.jre8</version>
<scope>test</scope>
</dependency>
<dependency>

2
hutool-db/src/main/java/org/dromara/hutool/db/ds/druid/DruidDSFactory.java
View File

@ -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

5
hutool-db/src/test/java/org/dromara/hutool/db/dialect/DialectFactoryTest.java
View File

@ -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) ));