Improve JDBC Url parsing (#366)

Co-authored-by: Kazuhiro Sera <seratch@gmail.com>

Author: jtjeferreira

core/src/main/scala/scalikejdbc/async/internal/JasyncConfiguration.scala

@@ -16,45 +16,49 @@
 package scalikejdbc.async.internal
 
 import com.github.jasync.sql.db.Configuration
-import scalikejdbc.JDBCUrl
 import scalikejdbc.async.AsyncConnectionSettings
 
 /**
  * Configuration attribute
  */
 private[scalikejdbc] trait JasyncConfiguration {
 
+  @deprecated("Will be removed in the future", "0.16.0")
   val defaultConfiguration = new Configuration("")
 
+  protected def parseUrl(url: String): Configuration
+
   private[scalikejdbc] def configuration(
     url: String,
     user: String,
     password: String,
     connectionSettings: AsyncConnectionSettings
   ) = {
-    val jdbcUrl = JDBCUrl(url)
-    new Configuration(
+    val baseConf = parseUrl(url)
+    baseConf.copy(
       user,
-      jdbcUrl.host,
-      jdbcUrl.port,
+      baseConf.getHost,
+      baseConf.getPort,
       password,
-      jdbcUrl.database,
-      connectionSettings.ssl.getOrElse(defaultConfiguration.getSsl),
-      connectionSettings.charset.getOrElse(defaultConfiguration.getCharset),
+      baseConf.getDatabase,
+      connectionSettings.ssl.getOrElse(baseConf.getSsl),
+      connectionSettings.charset.getOrElse(baseConf.getCharset),
       connectionSettings.maximumMessageSize.getOrElse(
-        defaultConfiguration.getMaximumMessageSize
+        baseConf.getMaximumMessageSize
       ),
-      connectionSettings.allocator.getOrElse(defaultConfiguration.getAllocator),
+      connectionSettings.allocator.getOrElse(baseConf.getAllocator),
       connectionSettings.connectTimeout
         .map(_.toMillis.toInt)
-        .getOrElse(defaultConfiguration.getConnectionTimeout),
+        .getOrElse(baseConf.getConnectionTimeout),
       connectionSettings.queryTimeout
         .map(x => java.time.Duration.ofMillis(x.toMillis))
-        .getOrElse(defaultConfiguration.getQueryTimeout),
-      defaultConfiguration.getApplicationName,
-      defaultConfiguration.getInterceptors,
-      defaultConfiguration.getEventLoopGroup,
-      defaultConfiguration.getExecutionContext
+        .getOrElse(baseConf.getQueryTimeout),
+      baseConf.getApplicationName,
+      baseConf.getInterceptors,
+      baseConf.getEventLoopGroup,
+      baseConf.getExecutionContext,
+      baseConf.getCurrentSchema,
+      baseConf.getSocketPath,
     )
   }
 

core/src/main/scala/scalikejdbc/async/internal/mysql/MySQLConnectionPoolImpl.scala

@@ -19,6 +19,9 @@ import scalikejdbc._, async._, internal._
 import com.github.jasync.sql.db.Configuration
 import com.github.jasync.sql.db.mysql.MySQLConnection
 import com.github.jasync.sql.db.mysql.pool.MySQLConnectionFactory
+import com.github.jasync.sql.db.mysql.util.URLParser
+
+import java.nio.charset.StandardCharsets
 
 /**
  * MySQL Connection Pool
@@ -42,6 +45,9 @@ private[scalikejdbc] class MySQLConnectionPoolImpl(
     settings
   ) {
 
+  override protected def parseUrl(url: String): Configuration =
+    URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
+
   override def borrow(): AsyncConnection = new PoolableAsyncConnection(pool)
     with MySQLConnectionImpl
 

core/src/main/scala/scalikejdbc/async/internal/mysql/SingleAsyncMySQLConnection.scala

@@ -15,8 +15,12 @@
  */
 package scalikejdbc.async.internal.mysql
 
+import com.github.jasync.sql.db.Configuration
+import com.github.jasync.sql.db.mysql.util.URLParser
 import scalikejdbc.async._, internal._
 
+import java.nio.charset.StandardCharsets
+
 /**
  * MySQL Single Connection
  */
@@ -29,6 +33,9 @@ private[scalikejdbc] case class SingleAsyncMySQLConnection(
   with MySQLConnectionImpl
   with JasyncConfiguration {
 
+  override protected def parseUrl(url: String): Configuration =
+    URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
+
   private[scalikejdbc] val underlying = {
     new com.github.jasync.sql.db.mysql.MySQLConnection(
       configuration(url, user, password, connectionSettings)

core/src/main/scala/scalikejdbc/async/internal/postgresql/PostgreSQLConnectionPoolImpl.scala

@@ -19,6 +19,9 @@ import scalikejdbc._, async._, internal._
 import com.github.jasync.sql.db.Configuration
 import com.github.jasync.sql.db.postgresql.PostgreSQLConnection
 import com.github.jasync.sql.db.postgresql.pool.PostgreSQLConnectionFactory
+import com.github.jasync.sql.db.postgresql.util.URLParser
+
+import java.nio.charset.StandardCharsets
 
 /**
  * PostgreSQL Connection Pool
@@ -42,6 +45,9 @@ private[scalikejdbc] class PostgreSQLConnectionPoolImpl(
     settings
   ) {
 
+  override protected def parseUrl(url: String): Configuration =
+    URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
+
   override def borrow(): AsyncConnection = new PoolableAsyncConnection(pool)
     with PostgreSQLConnectionImpl
 

core/src/main/scala/scalikejdbc/async/internal/postgresql/SingleAsyncPostgreSQLConnection.scala

@@ -15,8 +15,12 @@
  */
 package scalikejdbc.async.internal.postgresql
 
+import com.github.jasync.sql.db.Configuration
+import com.github.jasync.sql.db.postgresql.util.URLParser
 import scalikejdbc.async._, internal._
 
+import java.nio.charset.StandardCharsets
+
 /**
  * PostgreSQL Single Connection
  */
@@ -29,6 +33,9 @@ private[scalikejdbc] case class SingleAsyncPostgreSQLConnection(
   with PostgreSQLConnectionImpl
   with JasyncConfiguration {
 
+  override protected def parseUrl(url: String): Configuration =
+    URLParser.INSTANCE.parse(url, StandardCharsets.UTF_8)
+
   private[scalikejdbc] val underlying = {
     new com.github.jasync.sql.db.postgresql.PostgreSQLConnection(
       configuration(url, user, password, connectionSettings)

core/src/test/scala/unit/DBSettings.scala

@@ -19,9 +19,8 @@ trait DBSettings extends ForAllTestContainer { self: Suite =>
   )
   override val container = MultipleContainers(mysql, postgres)
 
-  // https://github.com/testcontainers/testcontainers-java/issues/2544
-  protected[this] final def mysqlJdbcUrl = mysql.jdbcUrl.split('?').head
-  protected[this] final def postgresJdbcUrl = postgres.jdbcUrl.split('?').head
+  protected[this] final def mysqlJdbcUrl = mysql.jdbcUrl
+  protected[this] final def postgresJdbcUrl = postgres.jdbcUrl
 
   protected[this] final val asyncConnectionPoolSettings
     : AsyncConnectionPoolSettings = AsyncConnectionPoolSettings()