Fix mariadb utf8 encoding..

This commit is contained in:
2020-08-13 20:39:29 +02:00
parent 24aabd494e
commit e65a4e10d6
4 changed files with 49 additions and 2 deletions
@@ -1,12 +1,23 @@
package be.simplenotes.persistance
import be.simplenotes.shared.config.DataSourceConfig
import org.flywaydb.core.Flyway
import javax.sql.DataSource
internal class DbMigrationsImpl(private val dataSource: DataSource) : DbMigrations {
internal class DbMigrationsImpl(
private val dataSource: DataSource,
private val dataSourceConfig: DataSourceConfig
) : DbMigrations {
override fun migrate() {
val migrationDir = when {
dataSourceConfig.jdbcUrl.contains("mariadb") -> "db/migration/mariadb"
else -> "db/migration/other"
}
Flyway.configure()
.dataSource(dataSource)
.locations(migrationDir)
.load()
.migrate()
}
@@ -30,7 +30,7 @@ private fun hikariDataSource(conf: DataSourceConfig): HikariDataSource {
val persistanceModule = module {
single<UserRepository> { UserRepositoryImpl(get()) }
single<NoteRepository> { NoteRepositoryImpl(get()) }
single<DbMigrations> { DbMigrationsImpl(get()) }
single<DbMigrations> { DbMigrationsImpl(get(), get()) }
single<DataSource> { hikariDataSource(get()) }
single { Database.connect(get<DataSource>()) }
}