Merge pull request quarkusio#10732 from Teg79/master

Added Flyway properties for placeholders prefix and suffix
mkouba · Jul 15, 2020 · bb4eed6 · bb4eed6
2 parents 666fd68 + 4d88fb0
commit bb4eed6
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 2 deletions.
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayCreator.java
@@ -50,6 +50,12 @@ public Flyway createFlyway(DataSource dataSource) {
         }
         configure.placeholders(flywayRuntimeConfig.placeholders);
         configure.createSchemas(flywayRuntimeConfig.createSchemas);
+        if (flywayRuntimeConfig.placeholderPrefix.isPresent()) {
+            configure.placeholderPrefix(flywayRuntimeConfig.placeholderPrefix.get());
+        }
+        if (flywayRuntimeConfig.placeholderSuffix.isPresent()) {
+            configure.placeholderSuffix(flywayRuntimeConfig.placeholderSuffix.get());
+        }
 
         /*
          * Ensure that no classpath scanning takes place by setting the ClassProvider and the ResourceProvider

diff --git a/...flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java b/...flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayDataSourceRuntimeConfig.java
@@ -120,4 +120,16 @@ public static final FlywayDataSourceRuntimeConfig defaultConfig() {
     @ConfigItem(defaultValue = "true")
     public boolean createSchemas;
 
+    /**
+     * Prefix of every placeholder (default: ${ )
+     */
+    @ConfigItem
+    public Optional<String> placeholderPrefix = Optional.empty();
+
+    /**
+     * Suffix of every placeholder (default: } )
+     */
+    @ConfigItem
+    public Optional<String> placeholderSuffix = Optional.empty();
+
 }
diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/FlywayFunctionalityResource.java
@@ -4,6 +4,7 @@
 import java.util.Objects;
 
 import javax.inject.Inject;
+import javax.persistence.EntityManager;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -26,6 +27,9 @@ public class FlywayFunctionalityResource {
     @FlywayDataSource("second-datasource")
     Flyway flyway2;
 
+    @Inject
+    EntityManager entityManager;
+
     @GET
     @Path("migrate")
     public String doMigrateAuto() {
@@ -35,6 +39,13 @@ public String doMigrateAuto() {
         return version.toString();
     }
 
+    @GET
+    @Path("title")
+    public String returnTitle() {
+        return entityManager.createQuery("select a from AppEntity a where a.id = 1", AppEntity.class)
+                .getSingleResult().getName();
+    }
+
     @GET
     @Path("multiple-flyway-migration")
     public String doMigrationOfSecondDataSource() {

diff --git a/integration-tests/flyway/src/main/resources/application.properties b/integration-tests/flyway/src/main/resources/application.properties
@@ -15,6 +15,9 @@ quarkus.flyway.locations=db/location1,classpath:db/location2,classpath:/db/locat
 quarkus.flyway.sql-migration-prefix=V
 quarkus.flyway.migrate-at-start=true
 quarkus.flyway.placeholders.foo=bar
+quarkus.flyway.placeholders.title=REPLACED
+quarkus.flyway.placeholder-prefix=#[
+quarkus.flyway.placeholder-suffix=]
 
 quarkus.hibernate-orm.database.generation=validate
 

diff --git a/integration-tests/flyway/src/main/resources/db/location1/V1.0.1__Quarkus.sql b/integration-tests/flyway/src/main/resources/db/location1/V1.0.1__Quarkus.sql
@@ -4,4 +4,4 @@ CREATE TABLE TEST_SCHEMA.quarkus_table2
     name VARCHAR(20)
 );
 INSERT INTO TEST_SCHEMA.quarkus_table2(id, name)
-VALUES (1, '1.0.1 QUARKED');
+VALUES (1, '1.0.1 #[title]');
diff --git a/integration-tests/flyway/src/main/resources/db/location2/V1.0.0__Quarkus.sql b/integration-tests/flyway/src/main/resources/db/location2/V1.0.0__Quarkus.sql
@@ -4,4 +4,4 @@ CREATE TABLE TEST_SCHEMA.quarkus
     name VARCHAR(20)
 );
 INSERT INTO TEST_SCHEMA.quarkus(id, name)
-VALUES (1, '${foo}');
+VALUES (1, '#[foo]');
diff --git a/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityTest.java b/integration-tests/flyway/src/test/java/io/quarkus/it/flyway/FlywayFunctionalityTest.java
@@ -35,4 +35,11 @@ public void testPlaceholders() {
     public void testCreateSchemasDefaultIsTrue() {
         when().get("/flyway/create-schemas").then().body(is("true"));
     }
+
+    @Test
+    @DisplayName("Verify placeholder replacement")
+    public void testPlaceholdersPrefixSuffix() {
+        when().get("/flyway/title").then().body(is("1.0.1 REPLACED"));
+    }
+
 }