From 0677c5808c75bda6b1a72528a3cef2899077251b Mon Sep 17 00:00:00 2001 From: zouchangfu Date: Thu, 30 Sep 2021 14:28:08 +0800 Subject: [PATCH 1/2] Add oscar driver support --- src/main/java/com/alibaba/druid/DbType.java | 2 ++ src/main/java/com/alibaba/druid/util/JdbcConstants.java | 3 +++ src/main/java/com/alibaba/druid/util/JdbcUtils.java | 2 ++ 3 files changed, 7 insertions(+) diff --git a/src/main/java/com/alibaba/druid/DbType.java b/src/main/java/com/alibaba/druid/DbType.java index 744e067aab..90b19ae053 100644 --- a/src/main/java/com/alibaba/druid/DbType.java +++ b/src/main/java/com/alibaba/druid/DbType.java @@ -56,6 +56,8 @@ public enum DbType { */ gaussdb (1 << 38), + oscar (1 << 36), + ingres (0), cloudscape (0), diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index bcd372a351..1a85c280aa 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -141,4 +141,7 @@ public interface JdbcConstants { */ DbType GREENPLUM = DbType.greenplum; String GREENPLUM_DRIVER = "com.pivotal.jdbc.GreenplumDriver"; + + DbType OSCAR = DbType.oscar; + String OSCAR_DRIVER = "com.oscar.Driver"; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 16e87cc278..f308ae5665 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -525,6 +525,8 @@ public final class JdbcUtils implements JdbcConstants { return JdbcConstants.POLARDB_DRIVER; } else if (rawUrl.startsWith("jdbc:highgo:")) { return "com.highgo.jdbc.Driver"; + } else if (rawUrl.startsWith("jdbc:oscar")) { + return JdbcConstants.OSCAR_DRIVER; } else { throw new SQLException("unknown jdbc driver : " + rawUrl); } From afc541efee6ca0e26778fc8b2622c6913966d247 Mon Sep 17 00:00:00 2001 From: zouchangfu Date: Tue, 19 Oct 2021 10:02:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A5=9E=E9=80=9A?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/alibaba/druid/util/JdbcConstants.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 1a85c280aa..ff18aa9111 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -142,6 +142,9 @@ public interface JdbcConstants { DbType GREENPLUM = DbType.greenplum; String GREENPLUM_DRIVER = "com.pivotal.jdbc.GreenplumDriver"; + /** + * oscar + */ DbType OSCAR = DbType.oscar; String OSCAR_DRIVER = "com.oscar.Driver"; }