Review the changes in "postgresql" in the main branch since commit bf…

…1b0d3 and port them to "mysql"
huanshankeji · Jan 18, 2025 · f54e251 · f54e251
1 parent 89d6913
commit f54e251
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/mysql/build.gradle.kts b/mysql/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 dependencies {
     with(commonDependencies.vertx) { implementation(platformStackDepchain()) } // needed
     implementation(cpnProject(project, ":core"))
-    //runtimeOnly(commonDependencies.postgreSql()) // TODO change to the MySQL JDBC dependency
-    // cannot modify commonDependencies?
-    //runtimeOnly();
+    implementation("com.mysql:mysql-connector-j:9.1.0")
+    // TODO remove the Exposed JDBC dependency and the PostgresSQL dependency when there is no need to to generate SQLs with an Exposed transaction
+    runtimeOnly(commonDependencies.exposed.module("jdbc"))
     implementation(commonDependencies.vertx.moduleWithoutVersion("mysql-client"))
     implementation(commonDependencies.kotlinCommon.core()) // for `Untested`
-    implementation(commonDependencies.kotlinCommon.vertx()) // for `PgPoolOptions.setUpConventionally` // TODO check if this is necessary for MySQL, and remove if not
+    // implementation(commonDependencies.kotlinCommon.vertx()) // for `PgPoolOptions.setUpConventionally`
     // this seems to be needed as mentioned in vertx-mysql-client
 }
diff --git a/...ain/kotlin/com/huanshankeji/exposedvertxsqlclient/mysql/vertx/mysqlclient/MySQLClients.kt b/...ain/kotlin/com/huanshankeji/exposedvertxsqlclient/mysql/vertx/mysqlclient/MySQLClients.kt
@@ -9,7 +9,6 @@ import com.huanshankeji.exposedvertxsqlclient.vertx.sqlclient.CoConnectHandler
 import com.huanshankeji.exposedvertxsqlclient.vertx.sqlclient.createGenericSqlClient
 import com.huanshankeji.exposedvertxsqlclient.vertx.sqlclient.createGenericSqlClientWithBuilder
 import com.huanshankeji.exposedvertxsqlclient.vertx.sqlclient.createGenericSqlConnection
-import com.huanshankeji.vertx.pgclient.setUpConventionally
 import io.vertx.core.Vertx
 import io.vertx.sqlclient.ClientBuilder
 import io.vertx.sqlclient.Pool
@@ -63,8 +62,6 @@ fun createPgClient(
     )
 
 /**
- * [PgPoolOptions.pipelined] is enabled by default.
- * @see PgPoolOptions.setUpConventionally
  * @see createGenericSqlClient
  */
 fun createPgPool(
@@ -79,10 +76,7 @@ fun createPgPool(
         connectionConfig,
         MySQLBuilder.pool(),
         extraPgConnectOptions,
-        {
-            setUpConventionally()
-            extraPoolOptions()
-        },
+        extraPoolOptions,
         connectHandlerExtra
     )