Add driver parameter (#319)

geirolz · Jul 19, 2024 · 412df86 · 412df86
1 parent 99998a8
commit 412df86
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/core/src/main/scala-2/fly4s/data/Fly4sConfig.scala b/core/src/main/scala-2/fly4s/data/Fly4sConfig.scala
@@ -53,6 +53,7 @@ case class Fly4sConfig(
   skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers,
   // --- mima after 1.0.0 ---
   loggers: List[LoggerType]             = defaultLoggers,
-  baseJavaConfig: Option[Configuration] = None
+  baseJavaConfig: Option[Configuration] = None,
+  driver: Option[String]                = defaultDriver
 ) extends Fly4sConfigContract
 object Fly4sConfig extends Fly4sConfigBuilder
diff --git a/core/src/main/scala-3/fly4s/data/Fly4sConfig.scala b/core/src/main/scala-3/fly4s/data/Fly4sConfig.scala
@@ -51,11 +51,16 @@ case class Fly4sConfig(
   skipDefaultResolvers: Boolean    = defaultSkipDefaultResolvers,
   // --- mima after 1.0.0 ---
   loggers: List[LoggerType]             = defaultLoggers,
-  baseJavaConfig: Option[Configuration] = None
+  baseJavaConfig: Option[Configuration] = None,
+  driver: Option[String]                = defaultDriver
 ) extends Fly4sConfigContract
 object Fly4sConfig extends Fly4sConfigBuilder:
 
   extension (i: Fly4sConfig)
+
+    def withDriver(driver: Option[String]): Fly4sConfig =
+      i.copy(driver = driver)
+
     def withConnectRetries(connectRetries: Int): Fly4sConfig =
       i.copy(connectRetries = connectRetries)
 

diff --git a/core/src/main/scala/fly4s/data/Fly4sConfigBuilder.scala b/core/src/main/scala/fly4s/data/Fly4sConfigBuilder.scala
@@ -61,6 +61,7 @@ private[fly4s] trait Fly4sConfigContract {
 }
 
 private[fly4s] object Fly4sConfigDefaults {
+  val defaultDriver: Option[String]                    = None
   val defaultConnectRetries: Int                       = 0
   val defaultInitSql: Option[String]                   = None
   val defaultDefaultSchemaName: Option[String]         = None
@@ -119,6 +120,7 @@ private[fly4s] trait Fly4sConfigBuilder {
     new Fly4sConfig(
       baseJavaConfig = Some(c),
       // ---------- connection ----------
+      driver            = Option(c.getDriver),
       connectRetries    = c.getConnectRetries,
       initSql           = Option(c.getInitSql),
       defaultSchemaName = Option(c.getDefaultSchema),
@@ -183,6 +185,7 @@ private[fly4s] trait Fly4sConfigBuilder {
 
     // ---------- connection ----------
     fluentConfiguration
+      .driver(c.driver.orNull)
       .connectRetries(c.connectRetries)
       .initSql(c.initSql.orNull)
       .defaultSchema(c.defaultSchemaName.orNull)