From ff33699ae91cffb00f8bca0de5d3be10eb371448 Mon Sep 17 00:00:00 2001 From: wl861106 <97649900+wl861106@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:33:22 +0800 Subject: [PATCH 1/5] Update additional-spring-configuration-metadata.json --- .../additional-spring-configuration-metadata.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/druid-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/druid-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index e3ac7726b7..8e174e0aa0 100644 --- a/druid-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/druid-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -105,6 +105,9 @@ { "value": "kingbase" }, + { + "value": "tydb" + }, { "value": "oceanbase" }, @@ -171,6 +174,9 @@ { "value": "kingbase" }, + { + "value": "tydb" + }, { "value": "oceanbase" }, @@ -201,4 +207,4 @@ ] } ] -} \ No newline at end of file +} From 2818800978e5a0565226443922fdacaf85a64989 Mon Sep 17 00:00:00 2001 From: wl861106 <97649900+wl861106@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:35:12 +0800 Subject: [PATCH 2/5] Update JdbcConstants.java --- src/main/java/com/alibaba/druid/util/JdbcConstants.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 02ab898b34..1b95209e20 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -152,4 +152,6 @@ public interface JdbcConstants { DbType OSCAR = DbType.oscar; String OSCAR_DRIVER = "com.oscar.Driver"; + DbType TYDB = DbType.tydb; + String TYDB_DRIVER = "com.dbcp.jdbc.Driver"; } From e300bfa98b5bb471cf7c2a3692ee94c0f769c4b1 Mon Sep 17 00:00:00 2001 From: wl861106 <97649900+wl861106@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:36:17 +0800 Subject: [PATCH 3/5] Update JdbcUtils.java --- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 8cdc0ed2cb..092482ebe8 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -529,6 +529,8 @@ public final class JdbcUtils implements JdbcConstants { return "com.highgo.jdbc.Driver"; } else if (rawUrl.startsWith("jdbc:oscar")) { return JdbcConstants.OSCAR_DRIVER; + } else if (rawUrl.startsWith("jdbc:dbcp:")) { + return JdbcConstants.TYDB_DRIVER; } else { throw new SQLException("unknown jdbc driver : " + rawUrl); } From f768ca1adcf9078977a43a1cda46679ae3006893 Mon Sep 17 00:00:00 2001 From: wl861106 <97649900+wl861106@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:37:07 +0800 Subject: [PATCH 4/5] Update DbType.java --- src/main/java/com/alibaba/druid/DbType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alibaba/druid/DbType.java b/src/main/java/com/alibaba/druid/DbType.java index 31f7c3a373..18af1fe0df 100644 --- a/src/main/java/com/alibaba/druid/DbType.java +++ b/src/main/java/com/alibaba/druid/DbType.java @@ -61,7 +61,9 @@ public enum DbType { oscar (1 << 40), tidb ( 1 << 41), - + + tydb ( 1 << 42), + ingres (0), cloudscape (0), timesten (0), From e5c4f4e21c13c1722fdcab72371a637764f7fe00 Mon Sep 17 00:00:00 2001 From: wl861106 <97649900+wl861106@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:39:23 +0800 Subject: [PATCH 5/5] Update JdbcUtilsTest2.java --- src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java index 404f14df95..700257e723 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtilsTest2.java @@ -32,4 +32,8 @@ public class JdbcUtilsTest2 extends TestCase { public void test_kdb() throws Exception { assertEquals(JdbcConstants.KDB_DRIVER, JdbcUtils.getDriverClassName("jdbc:inspur:")); } + + public void test_tydb() throws Exception { + assertEquals(JdbcConstants.TYDB_DRIVER, JdbcUtils.getDriverClassName("jdbc:dbcp:")); + } }