From cb078d18a1813a00ec0204220c7c5bd593c7a7c2 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 16 Jan 2024 01:27:25 +0100 Subject: [PATCH 1/2] gitignore test.trace.db and remove it before running tests --- play-scala-isolated-slick-example/.gitignore | 1 + play-scala-isolated-slick-example/scripts/test-sbt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/play-scala-isolated-slick-example/.gitignore b/play-scala-isolated-slick-example/.gitignore index 851d28ca7..638419295 100644 --- a/play-scala-isolated-slick-example/.gitignore +++ b/play-scala-isolated-slick-example/.gitignore @@ -1 +1,2 @@ test.mv.db +test.trace.db diff --git a/play-scala-isolated-slick-example/scripts/test-sbt b/play-scala-isolated-slick-example/scripts/test-sbt index f5ad676df..fe70d2df8 100755 --- a/play-scala-isolated-slick-example/scripts/test-sbt +++ b/play-scala-isolated-slick-example/scripts/test-sbt @@ -3,5 +3,5 @@ echo "+----------------------------+" echo "| Executing tests using sbt |" echo "+----------------------------+" -rm -f test.mv.db +rm -f test.mv.db test.trace.db sbt ++$MATRIX_SCALA clean flyway/flywayMigrate slickCodegen test From b2cea1780a5264ff04ec45303bf392930ee9662c Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Tue, 16 Jan 2024 01:31:24 +0100 Subject: [PATCH 2/2] Downgrade h2 database --- play-scala-isolated-slick-example/build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/play-scala-isolated-slick-example/build.sbt b/play-scala-isolated-slick-example/build.sbt index 9530f9dc3..7dc7c8391 100644 --- a/play-scala-isolated-slick-example/build.sbt +++ b/play-scala-isolated-slick-example/build.sbt @@ -82,7 +82,9 @@ lazy val root = (project in file(".")) TwirlKeys.templateImports += "com.example.user.User", libraryDependencies ++= Seq( guice, - "com.h2database" % "h2" % "2.2.224", + "com.h2database" % "h2" % "1.4.200", // Can't use latest h2 currently: flyway-sbt comes with an outdated flyway version that does not support h2 2.x yet...: + // https://github.com/flyway/flyway-sbt/blob/7fc35d2833531b2b9e5a98a594d76fd047a077a8/build.sbt#L1 + // https://github.com/flyway/flyway-sbt/issues/82#issuecomment-1636728997 ws % Test, "org.flywaydb" % "flyway-core" % FlywayVersion % Test, "org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test