Simplify configuration

This commit is contained in:
2021-02-27 20:34:44 +01:00
parent f255064533
commit ea110d51d3
6 changed files with 9 additions and 9 deletions
+5 -1
View File
@@ -23,7 +23,11 @@ class PersistenceModule {
internal fun dataSource(conf: DataSourceConfig): HikariDataSource {
val hikariConfig = HikariConfig().also {
it.jdbcUrl = conf.jdbcUrl
it.driverClassName = conf.driverClassName
it.driverClassName = when {
conf.jdbcUrl.startsWith("jdbc:mariadb") -> "org.mariadb.jdbc.Driver"
conf.jdbcUrl.startsWith("jdbc:h2") -> "org.h2.Driver"
else -> error("Unsupported database")
}
it.username = conf.username
it.password = conf.password
it.maximumPoolSize = conf.maximumPoolSize
-2
View File
@@ -7,7 +7,6 @@ class KMariadbContainer : MariaDBContainer<KMariadbContainer>("mariadb:10.5.5")
fun h2dataSourceConfig() = DataSourceConfig(
jdbcUrl = "jdbc:h2:mem:regular;DB_CLOSE_DELAY=-1;",
driverClassName = "org.h2.Driver",
username = "h2",
password = "",
maximumPoolSize = 2,
@@ -16,7 +15,6 @@ fun h2dataSourceConfig() = DataSourceConfig(
fun mariadbDataSourceConfig(jdbcUrl: String) = DataSourceConfig(
jdbcUrl = jdbcUrl,
driverClassName = "org.mariadb.jdbc.Driver",
username = "test",
password = "test",
maximumPoolSize = 2,