From ff0f30ad838e2161eb803624f5fc5679fdae7035 Mon Sep 17 00:00:00 2001
From: wangjunbo <wangjunbo@qiyi.com>
Date: Fri, 10 Nov 2023 11:59:21 +0800
Subject: [PATCH] [KYUUBI #5464] fix check

---
 .../kyuubi/engine/jdbc/connection/ConnectionProvider.scala | 7 +++----
 .../apache/kyuubi/engine/jdbc/mysql/WithMySQLEngine.scala  | 7 ++-----
 integration-tests/kyuubi-jdbc-it/pom.xml                   | 6 ++++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/connection/ConnectionProvider.scala b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/connection/ConnectionProvider.scala
index cb6e4b6c551..36886da5c91 100644
--- a/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/connection/ConnectionProvider.scala
+++ b/externals/kyuubi-jdbc-engine/src/main/scala/org/apache/kyuubi/engine/jdbc/connection/ConnectionProvider.scala
@@ -57,10 +57,9 @@ abstract class AbstractConnectionProvider extends Logging {
       case None =>
         // TODO
         if (filteredProviders.size != 1) {
-          throw new IllegalArgumentException(
-            "JDBC connection initiated but more than one connection provider was found. Use " +
-              s"${ENGINE_JDBC_CONNECTION_PROVIDER.key} option to select a specific provider. " +
-              s"Found active providers ${filteredProviders.mkString("[", ", ", "]")}")
+          warn("JDBC connection initiated but more than one connection provider was found. Use " +
+            s"${ENGINE_JDBC_CONNECTION_PROVIDER.key} option to select a specific provider. " +
+            s"Found active providers ${filteredProviders.mkString("[", ", ", "]")}")
         }
         filteredProviders.head
     }
diff --git a/externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/mysql/WithMySQLEngine.scala b/externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/mysql/WithMySQLEngine.scala
index 6476f5a4c9c..bd79e0a27b6 100644
--- a/externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/mysql/WithMySQLEngine.scala
+++ b/externals/kyuubi-jdbc-engine/src/test/scala/org/apache/kyuubi/engine/jdbc/mysql/WithMySQLEngine.scala
@@ -27,7 +27,7 @@ trait WithMySQLEngine extends WithJdbcEngine with TestContainerForAll {
 
   private val mysqlDockerImage = "mysql:8.0.32"
 
-  override val containerDef: MySQLContainer.Def = MySQLContainer.Def(
+  override val containerDef = MySQLContainer.Def(
     dockerImageName = DockerImageName.parse(mysqlDockerImage),
     username = "root",
     password = "kyuubi")
@@ -40,9 +40,6 @@ trait WithMySQLEngine extends WithJdbcEngine with TestContainerForAll {
       ENGINE_JDBC_CONNECTION_PASSWORD.key -> "kyuubi",
       ENGINE_TYPE.key -> "jdbc",
       ENGINE_JDBC_SHORT_NAME.key -> "mysql",
-      ENGINE_JDBC_DRIVER_CLASS.key -> "com.mysql.cj.jdbc.Driver",
-      ENGINE_JDBC_CONNECTION_PROVIDER.key ->
-        "MySQLConnectionProvider")
+      ENGINE_JDBC_DRIVER_CLASS.key -> "com.mysql.cj.jdbc.Driver")
   }
-
 }
diff --git a/integration-tests/kyuubi-jdbc-it/pom.xml b/integration-tests/kyuubi-jdbc-it/pom.xml
index 820429cc4a0..ac13295a525 100644
--- a/integration-tests/kyuubi-jdbc-it/pom.xml
+++ b/integration-tests/kyuubi-jdbc-it/pom.xml
@@ -78,6 +78,12 @@
             <artifactId>testcontainers-scala-scalatest_${scala.binary.version}</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.dimafeng</groupId>
+            <artifactId>testcontainers-scala-mysql_${scala.binary.version}</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>