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

Merge pull request #291 from scala-steward/update/flyway-core-7.0.0

Browse Source 
Update flyway-core to 7.0.0
This commit is contained in:
mergify[bot]
2020-09-28 13:21:25 +00:00
committed by GitHub
parent 48757cb6c7 552cdac1d3
commit b76171e198
3 changed files with 4 additions and 3 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] =
FlywayMigrate.run[F](jdbc)
FlywayMigrate.run[F](jdbc).map(_.migrationsExecuted)
def transact[A](prg: doobie.ConnectionIO[A]): F[A] =
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 org.flywaydb.core.Flyway
import org.flywaydb.core.api.output.MigrateResult
import org.log4s._
object FlywayMigrate {
private[this] val logger = getLogger
def run[F[_]: Sync](jdbc: JdbcConfig): F[Int] =
def run[F[_]: Sync](jdbc: JdbcConfig): F[MigrateResult] =
Sync[F].delay {
logger.info("Running db migrations...")
val locations = jdbc.dbmsName match {

2
project/Dependencies.scala
View File

@ -14,7 +14,7 @@ object Dependencies {
val EmilVersion = "0.6.3"
val FastparseVersion = "2.1.3"
val FlexmarkVersion = "0.62.2"
val FlywayVersion = "6.5.7"
val FlywayVersion = "7.0.0"
val Fs2Version = "2.4.4"
val H2Version = "1.4.200"
val Http4sVersion = "0.21.7"