Allows to override jdbc connectionString (#596)

Also, bumps version Co-authored-by: Arnaud Dufranne <[email protected]>
criteo · Feb 25, 2021 · bd90de0 · bd90de0
1 parent fd19e9f
commit bd90de0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ val devMode = settingKey[Boolean]("Some build optimization are applied in devMod
 val writeClasspath = taskKey[File]("Write the project classpath to a file.")
 val yarnInstall = taskKey[Unit]("Install yarn dependencies")
 
-val VERSION = "0.12.1"
+val VERSION = "0.12.2"
 
 lazy val catsCore = "1.6.1"
 lazy val circe = "0.11.1"

diff --git a/core/src/main/scala/com/criteo/cuttle/Database.scala b/core/src/main/scala/com/criteo/cuttle/Database.scala
@@ -34,7 +34,7 @@ case class DBLocation(host: String, port: Int)
   * @param username JDBC username
   * @param password JDBC password
   */
-case class DatabaseConfig(locations: Seq[DBLocation], database: String, username: String, password: String)
+case class DatabaseConfig(locations: Seq[DBLocation], database: String, username: String, password: String, jdbcString: Option[String] = None)
 
 /** Utilities for [[DatabaseConfig]]. */
 object DatabaseConfig {
@@ -186,8 +186,9 @@ object Database {
     import com.criteo.cuttle.ThreadPools.Implicits.doobieContextShift
 
     val locationString = dbConfig.locations.map(dbLocation => s"${dbLocation.host}:${dbLocation.port}").mkString(",")
-    val jdbcString = s"jdbc:mariadb://$locationString/${dbConfig.database}" +
-      "?serverTimezone=UTC&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&rewriteBatchedStatements=true"
+
+    val jdbcString = dbConfig.jdbcString.getOrElse(s"jdbc:mariadb://$locationString/${dbConfig.database}" +
+      "?serverTimezone=UTC&useSSL=false&allowMultiQueries=true&failOverReadOnly=false&rewriteBatchedStatements=true")
 
     for {
       connectThreadPool <- ThreadPools.doobieConnectThreadPoolResource