From a668c46e89c68f8289cffb7317d0016f3e1f4f9e Mon Sep 17 00:00:00 2001 From: mask <39329477+Narcasserun@users.noreply.github.com> Date: Fri, 31 Dec 2021 13:49:17 +0800 Subject: [PATCH] [fix-7750]Compatible historical version data source connection information(#7750) (#7751) --- .../api/provider/JdbcDataSourceProvider.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/provider/JdbcDataSourceProvider.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/provider/JdbcDataSourceProvider.java index 16cb02769..24a6a29fe 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/provider/JdbcDataSourceProvider.java +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/provider/JdbcDataSourceProvider.java @@ -98,12 +98,11 @@ public class JdbcDataSourceProvider { logger.warn("Jdbc driver loading error. Driver {} cannot accept url.", drv); throw new RuntimeException("Jdbc driver loading error."); } - if (dbType.equals(DbType.MYSQL)) { - if (driver.getMajorVersion() >= 8) { - properties.setDriverClassName(drv); - } else { - properties.setDriverClassName(Constants.COM_MYSQL_JDBC_DRIVER); - } + //Compatible historical version data source connection information + if (dbType.equals(DbType.MYSQL) && driver.getMajorVersion() <= 8) { + properties.setDriverClassName(Constants.COM_MYSQL_JDBC_DRIVER); + } else { + properties.setDriverClassName(drv); } } catch (final Exception e) { logger.warn("The specified driver not suitable."); -- GitLab