TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-21 18:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply flyway api changes

Browse Source
This commit is contained in:
Eike Kettner
2020-09-28 15:12:10 +02:00
parent ee78133e49
commit 552cdac1d3
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/store/src/main/scala/docspell/store/impl/StoreImpl.scala
View File

@ -22,7 +22,7 @@ final class StoreImpl[F[_]: Effect](jdbc: JdbcConfig, xa: Transactor[F])
) )
def migrate: F[Int] = def migrate: F[Int] =
FlywayMigrate.run[F](jdbc) FlywayMigrate.run[F](jdbc).map(_.migrationsExecuted)
def transact[A](prg: doobie.ConnectionIO[A]): F[A] = def transact[A](prg: doobie.ConnectionIO[A]): F[A] =
prg.transact(xa) prg.transact(xa)

3
modules/store/src/main/scala/docspell/store/migrate/FlywayMigrate.scala
View File

@ -5,12 +5,13 @@ import cats.effect.Sync
import docspell.store.JdbcConfig import docspell.store.JdbcConfig
import org.flywaydb.core.Flyway import org.flywaydb.core.Flyway
import org.flywaydb.core.api.output.MigrateResult
import org.log4s._ import org.log4s._
object FlywayMigrate { object FlywayMigrate {
private[this] val logger = getLogger private[this] val logger = getLogger
def run[F[_]: Sync](jdbc: JdbcConfig): F[Int] = def run[F[_]: Sync](jdbc: JdbcConfig): F[MigrateResult] =
Sync[F].delay { Sync[F].delay {
logger.info("Running db migrations...") logger.info("Running db migrations...")
val locations = jdbc.dbmsName match { val locations = jdbc.dbmsName match {