From 051c804ab3eed0abd3c066f7ad7465e76a57727f Mon Sep 17 00:00:00 2001 From: kimmking Date: Sat, 4 Mar 2023 16:40:36 +0800 Subject: [PATCH] add mysql-connector/j 6.0.3 support --- .../src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 +++- core/src/main/java/com/alibaba/druid/util/JdbcConstants.java | 1 + core/src/main/java/com/alibaba/druid/util/JdbcUtils.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 318812363f..e3f71e6abd 100644 --- a/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/core/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -1286,6 +1286,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } else if (dbType == DbType.mysql || JdbcUtils.MYSQL_DRIVER.equals(this.driverClass) || JdbcUtils.MYSQL_DRIVER_6.equals(this.driverClass) + || JdbcUtils.MYSQL_DRIVER_603.equals(this.driverClass) ) { isMySql = true; } @@ -1395,7 +1396,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (Class driverClass = driver.getClass(); ; ) { String realDriverClassName = driverClass.getName(); if (realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER) // - || realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER_6)) { + || realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER_6) + || realDriverClassName.equals(JdbcConstants.MYSQL_DRIVER_603)) { this.exceptionSorter = new MySqlExceptionSorter(); this.isMySql = true; } else if (realDriverClassName.equals(JdbcConstants.ORACLE_DRIVER) diff --git a/core/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/core/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 23332adb71..3daeebb830 100644 --- a/core/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/core/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -50,6 +50,7 @@ public interface JdbcConstants { DbType MYSQL = DbType.mysql; String MYSQL_DRIVER = "com.mysql.jdbc.Driver"; String MYSQL_DRIVER_6 = "com.mysql.cj.jdbc.Driver"; + String MYSQL_DRIVER_603 = "com.mysql.cj.api.MysqlConnection"; String MYSQL_DRIVER_REPLICATE = "com.mysql.jdbc."; String MARIADB = "mariadb"; diff --git a/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 7cac015ceb..40cf7b798c 100644 --- a/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -927,6 +927,7 @@ public final class JdbcUtils implements JdbcConstants { public static boolean isMySqlDriver(String driverClassName) { return driverClassName.equals(JdbcConstants.MYSQL_DRIVER) // || driverClassName.equals(JdbcConstants.MYSQL_DRIVER_6) + || driverClassName.equals(JdbcConstants.MYSQL_DRIVER_603) || driverClassName.equals(JdbcConstants.MYSQL_DRIVER_REPLICATE); }