mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-11 04:45:57 +03:00
Upgrade Flyway to v7. (#10594)
Flyway v6.5 does not officially support the latest versions of PostgreSQL. CHANGELOG_BEGIN CHANGELOG_END
This commit is contained in:
parent
654d2eee1b
commit
386965c466
@ -151,7 +151,7 @@ def install_java_deps():
|
||||
"org.apache.commons:commons-text:1.4",
|
||||
"org.awaitility:awaitility:3.1.6",
|
||||
"org.checkerframework:checker:2.5.4",
|
||||
"org.flywaydb:flyway-core:6.5.0",
|
||||
"org.flywaydb:flyway-core:7.13.0",
|
||||
"org.freemarker:freemarker-gae:2.3.28",
|
||||
"org.jline:jline:3.7.1",
|
||||
"org.jline:jline-reader:3.7.1",
|
||||
|
@ -11,7 +11,7 @@ import com.daml.platform.store.FlywayMigrationsSpec._
|
||||
import org.apache.commons.io.IOUtils
|
||||
import org.flywaydb.core.api.configuration.FluentConfiguration
|
||||
import org.flywaydb.core.api.migration.JavaMigration
|
||||
import org.flywaydb.core.internal.resource.LoadableResource
|
||||
import org.flywaydb.core.api.resource.LoadableResource
|
||||
import org.flywaydb.core.internal.scanner.{LocationScannerCache, ResourceNameCache, Scanner}
|
||||
import org.scalatest.matchers.should.Matchers._
|
||||
import org.scalatest.wordspec.AnyWordSpec
|
||||
@ -27,7 +27,7 @@ class FlywayMigrationsSpec extends AnyWordSpec {
|
||||
assertFlywayMigrationFileHashes(DbType.Postgres, 10)
|
||||
}
|
||||
"always have a valid SHA-256 digest file accompanied (append-only)" in {
|
||||
assertFlywayMigrationFileHashes(DbType.Postgres, 1, true)
|
||||
assertFlywayMigrationFileHashes(DbType.Postgres, 1, enableAppendOnlySchema = true)
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ class FlywayMigrationsSpec extends AnyWordSpec {
|
||||
// modifying the existing migration instead of treating it as immutable, because we don't provide
|
||||
// data continuity with H2.
|
||||
"always have a valid SHA-256 digest file accompanied (append-only)" in {
|
||||
assertFlywayMigrationFileHashes(DbType.H2Database, 1, true)
|
||||
assertFlywayMigrationFileHashes(DbType.H2Database, 1, enableAppendOnlySchema = true)
|
||||
}
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ class FlywayMigrationsSpec extends AnyWordSpec {
|
||||
assertFlywayMigrationFileHashes(DbType.Oracle, 1)
|
||||
}
|
||||
"always have a valid SHA-256 digest file accompanied (append-only)" in {
|
||||
assertFlywayMigrationFileHashes(DbType.Oracle, 1, true)
|
||||
assertFlywayMigrationFileHashes(DbType.Oracle, 1, enableAppendOnlySchema = true)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -86,8 +86,11 @@ object FlywayMigrationsSpec {
|
||||
config.getLocations.toList.asJava,
|
||||
getClass.getClassLoader,
|
||||
config.getEncoding,
|
||||
false,
|
||||
false,
|
||||
new ResourceNameCache,
|
||||
new LocationScannerCache,
|
||||
false,
|
||||
)
|
||||
|
||||
private def getExpectedDigest(
|
||||
|
@ -11,7 +11,7 @@ import java.util
|
||||
|
||||
import org.flywaydb.core.Flyway
|
||||
import org.flywaydb.core.api.configuration.FluentConfiguration
|
||||
import org.flywaydb.core.internal.resource.LoadableResource
|
||||
import org.flywaydb.core.api.resource.LoadableResource
|
||||
import org.flywaydb.core.internal.scanner.{LocationScannerCache, ResourceNameCache, Scanner}
|
||||
import org.scalatest.matchers.should.Matchers._
|
||||
import org.scalatest.wordspec.AnyWordSpec
|
||||
@ -29,8 +29,11 @@ abstract class AbstractImmutableMigrationsSpec extends AnyWordSpec {
|
||||
util.Arrays.asList(configuration.getLocations: _*),
|
||||
getClass.getClassLoader,
|
||||
configuration.getEncoding,
|
||||
false,
|
||||
false,
|
||||
new ResourceNameCache,
|
||||
new LocationScannerCache,
|
||||
false,
|
||||
)
|
||||
|
||||
private def readExpectedDigest(
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user