From c77c8e731f407dd94cbe30153443f78a0006be1a Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Sat, 10 Oct 2020 17:18:43 +0800 Subject: [PATCH] fix url prefix jdbc:oceanbase:oracle recognize error Signed-off-by: hongwei yi hongweiyi@hotmail.com workaround: if you need use oceanbase oracle type in Druid previous version, please use DruidDataSource.setDbType("oceanbase_oracle") instead --- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 4 ++-- .../java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 7e990eee72..1dc04a82ff 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -545,10 +545,10 @@ public final class JdbcUtils implements JdbcConstants { return DbType.oracle; } else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) { return DbType.ali_oracle; - } else if (rawUrl.startsWith("jdbc:oceanbase:")) { - return DbType.oceanbase; } else if (rawUrl.startsWith("jdbc:oceanbase:oracle:")) { return DbType.oceanbase_oracle; + } else if (rawUrl.startsWith("jdbc:oceanbase:")) { + return DbType.oceanbase; } else if (rawUrl.startsWith("jdbc:microsoft:") || rawUrl.startsWith("jdbc:log4jdbc:microsoft:")) { return DbType.sqlserver; } else if (rawUrl.startsWith("jdbc:sqlserver:") || rawUrl.startsWith("jdbc:log4jdbc:sqlserver:")) { diff --git a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java index 440e6dda1e..79c4a4c4b5 100644 --- a/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java +++ b/src/test/java/com/alibaba/druid/bvt/utils/JdbcUtils_driver.java @@ -30,6 +30,11 @@ public class JdbcUtils_driver extends TestCase { Assert.assertEquals(JdbcConstants.ODPS, JdbcUtils.getDbTypeRaw(url, className)); } + public void test_oceanbase() { + assertEquals(JdbcConstants.OCEANBASE, DbType.of(JdbcUtils.getDbType("jdbc:oceanbase://127.1:3306/test?a=b", null))); + assertEquals(JdbcConstants.OCEANBASE_ORACLE, DbType.of(JdbcUtils.getDbType("jdbc:oceanbase:oracle://127.1:3306/test?a=b", null))); + } + public void test_log4jdbc_mysql() { String jdbcUrl = "jdbc:log4jdbc:mysql://localhost:8066/test"; DbType dbType = JdbcUtils.getDbTypeRaw(jdbcUrl, null);