From 01568c239fd348acc78c41d1d13e7745e408e930 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Mon, 17 Oct 2022 12:39:54 -0300 Subject: [PATCH] Use a different DB in test - Fixes #28618 (cherry picked from commit afcb4e6b1336cf7a7a6199524884a660fee07e66) --- .../flyway/test/FlywayExtensionRepairAtStartTest.java | 2 +- .../src/test/resources/init-sql-config.properties | 2 +- .../src/test/resources/repair-at-start-config.properties | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 extensions/flyway/deployment/src/test/resources/repair-at-start-config.properties diff --git a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java index 266ce887bf410..695d72326c2a4 100644 --- a/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java +++ b/extensions/flyway/deployment/src/test/java/io/quarkus/flyway/test/FlywayExtensionRepairAtStartTest.java @@ -26,7 +26,7 @@ public class FlywayExtensionRepairAtStartTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClass(FlywayResource.class) .addAsResource("db/migration/V1.0.0__Quarkus.sql") - .addAsResource("migrate-at-start-config.properties", "application.properties")) + .addAsResource("repair-at-start-config.properties", "application.properties")) .setLogRecordPredicate(r -> true) .setAllowFailedStart(true); diff --git a/extensions/flyway/deployment/src/test/resources/init-sql-config.properties b/extensions/flyway/deployment/src/test/resources/init-sql-config.properties index be8b0b8b64b2a..a59d04d5e3072 100644 --- a/extensions/flyway/deployment/src/test/resources/init-sql-config.properties +++ b/extensions/flyway/deployment/src/test/resources/init-sql-config.properties @@ -1,7 +1,7 @@ quarkus.datasource.db-kind=h2 quarkus.datasource.username=sa quarkus.datasource.password=sa -quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-migrate-at-start;DB_CLOSE_DELAY=-1 +quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:init-sql-config;DB_CLOSE_DELAY=-1 # Flyway config properties quarkus.flyway.migrate-at-start=true diff --git a/extensions/flyway/deployment/src/test/resources/repair-at-start-config.properties b/extensions/flyway/deployment/src/test/resources/repair-at-start-config.properties new file mode 100644 index 0000000000000..564b875154758 --- /dev/null +++ b/extensions/flyway/deployment/src/test/resources/repair-at-start-config.properties @@ -0,0 +1,7 @@ +quarkus.datasource.db-kind=h2 +quarkus.datasource.username=sa +quarkus.datasource.password=sa +quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test-quarkus-repair-at-start;DB_CLOSE_DELAY=-1 + +# Flyway config properties +quarkus.flyway.migrate-at-start=true