From a5b5317f2e4c8c88a7541112f19eb4bcc07db28d Mon Sep 17 00:00:00 2001 From: TouyamaRie Date: Tue, 19 Aug 2025 14:49:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8D=97=E5=A4=A7?= =?UTF-8?q?=E9=80=9A=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93`GBase8c`=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 DialectFactory 中添加了对 GBase8c 的支持,并修改匹配条件顺序 - 在 DriverNamePool 中添加了对应的驱动类名 --- .../java/cn/hutool/db/dialect/DialectFactory.java | 11 +++++++---- .../java/cn/hutool/db/dialect/DriverNamePool.java | 9 +++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java index 836c7f233..ed8e58c96 100755 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java @@ -152,9 +152,6 @@ public class DialectFactory implements DriverNamePool { } else if (nameContainsProductInfo.contains("zenith")) { // 华为高斯 driver = DRIVER_GAUSS; - } else if (nameContainsProductInfo.contains("gbase")) { - // 南大通用数据库 - driver = DRIVER_GBASE; } else if (nameContainsProductInfo.contains("oscar")) { // 神州数据库 driver = DRIVER_OSCAR; @@ -174,8 +171,14 @@ public class DialectFactory implements DriverNamePool { // sap hana driver = DRIVER_HANA; } else if (nameContainsProductInfo.contains("gbasedbt-sqli")) { - // Gbase8s,见:https://www.gbase.cn/community/post/4029 + // GBase 8s,见:https://www.gbase.cn/community/post/4029 driver = DRIVER_GBASE8S; + } else if (nameContainsProductInfo.contains("gbase8c")) { + // GBase 8c,见:https://www.gbase.cn/download/gbase-8c?category=DRIVER_PACKAGE 页面 GBase8c_JDBC.zip 中的《JDBC 使用手册_V1.0_20230818.pdf》p14 + driver = DRIVER_GBASE8C; + } else if (nameContainsProductInfo.contains("gbase")) { + // 南大通用数据库 GBase 8a + driver = DRIVER_GBASE; } return driver; diff --git a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java index 89885afc2..d4ec98334 100644 --- a/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java +++ b/hutool-db/src/main/java/cn/hutool/db/dialect/DriverNamePool.java @@ -101,14 +101,19 @@ public interface DriverNamePool { */ String DRIVER_GAUSS = "com.huawei.gauss.jdbc.ZenithDriver"; /** - * JDBC 驱动 南大通用 + * JDBC 驱动 南大通用 GBase 8a */ String DRIVER_GBASE = "com.gbase.jdbc.Driver"; /** - * JDBC 驱动 南大通用8S
+ * JDBC 驱动 南大通用 GBase 8s
* 见:https://www.gbase.cn/community/post/4029 */ String DRIVER_GBASE8S = "com.gbasedbt.jdbc.Driver"; + /** + * JDBC 驱动 南大通用 GBase 8c
+ * 见:https://www.gbase.cn/download/gbase-8c?category=DRIVER_PACKAGE 页面 GBase8c_JDBC.zip 中的《JDBC 使用手册_V1.0_20230818.pdf》p14 + */ + String DRIVER_GBASE8C = "cn.gbase8c.Driver"; /** * JDBC 驱动 神州数据库 */