Skip to content

Commit 6d39e18

Browse files
authored
Add driver parameter (#318)
1 parent 1fb8ebb commit 6d39e18

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

core/src/main/scala-2/fly4s/data/Fly4sConfig.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ case class Fly4sConfig(
5353
skipDefaultResolvers: Boolean = defaultSkipDefaultResolvers,
5454
// --- mima after 0.1.0 ---
5555
loggers: List[LoggerType] = defaultLoggers,
56-
baseJavaConfig: Option[Configuration] = None
56+
baseJavaConfig: Option[Configuration] = None,
57+
driver: Option[String] = defaultDriver
5758
) extends Fly4sConfigContract
5859
object Fly4sConfig extends Fly4sConfigBuilder

core/src/main/scala-3/fly4s/data/Fly4sConfig.scala

+6-1
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,16 @@ case class Fly4sConfig(
5151
skipDefaultResolvers: Boolean = defaultSkipDefaultResolvers,
5252
// --- mima after 0.1.0 ---
5353
loggers: List[LoggerType] = defaultLoggers,
54-
baseJavaConfig: Option[Configuration] = None
54+
baseJavaConfig: Option[Configuration] = None,
55+
driver: Option[String] = defaultDriver
5556
) extends Fly4sConfigContract
5657
object Fly4sConfig extends Fly4sConfigBuilder:
5758

5859
extension (i: Fly4sConfig)
60+
61+
def withDriver(driver: Option[String]): Fly4sConfig =
62+
i.copy(driver = driver)
63+
5964
def withConnectRetries(connectRetries: Int): Fly4sConfig =
6065
i.copy(connectRetries = connectRetries)
6166

core/src/main/scala/fly4s/data/Fly4sConfigBuilder.scala

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ private[fly4s] trait Fly4sConfigContract {
6161
}
6262

6363
private[fly4s] object Fly4sConfigDefaults {
64+
val defaultDriver: Option[String] = None
6465
val defaultConnectRetries: Int = 0
6566
val defaultInitSql: Option[String] = None
6667
val defaultDefaultSchemaName: Option[String] = None
@@ -119,6 +120,7 @@ private[fly4s] trait Fly4sConfigBuilder {
119120
new Fly4sConfig(
120121
baseJavaConfig = Some(c),
121122
// ---------- connection ----------
123+
driver = Option(c.getDriver),
122124
connectRetries = c.getConnectRetries,
123125
initSql = Option(c.getInitSql),
124126
defaultSchemaName = Option(c.getDefaultSchema),
@@ -183,6 +185,7 @@ private[fly4s] trait Fly4sConfigBuilder {
183185

184186
// ---------- connection ----------
185187
fluentConfiguration
188+
.driver(c.driver.orNull)
186189
.connectRetries(c.connectRetries)
187190
.initSql(c.initSql.orNull)
188191
.defaultSchema(c.defaultSchemaName.orNull)

0 commit comments

Comments
 (0)