From 635846ffccf1b6d1ecbe949d3f87bc72ba3297c1 Mon Sep 17 00:00:00 2001 From: Adrian Maghear Date: Fri, 17 Jul 2020 10:54:38 +0200 Subject: [PATCH 1/4] [BAEL4288] initial commit --- persistence-modules/flyway-repair/README.MD | 3 + .../flyway-repair/docker-compose/.env | 2 + .../docker-compose/docker-compose.yaml | 23 ++++ .../flyway-repair/docker-compose/mysql.env | 5 + .../flyway-repair/docker-compose/postgres.env | 3 + persistence-modules/flyway-repair/pom.xml | 105 ++++++++++++++++++ .../flywaycallbacks/FlywayApplication.java | 13 +++ .../application-callbacks.properties | 1 + .../main/resources/application-h2.properties | 3 + .../resources/application-mysql.properties | 3 + .../resources/application-postgres.properties | 3 + .../src/main/resources/application.properties | 6 + .../db/callbacks/afterMigrateError.sql | 1 + .../db/migration/V1_0__add_table_one.sql | 3 + .../db/migration/V1_1__add_table_two.sql | 3 + .../db/migration/V1_2__add_table_three.sql | 3 + .../db/migration/V1_3__add_table.sql | 3 + .../src/main/resources/logback.xml | 19 ++++ 18 files changed, 202 insertions(+) create mode 100644 persistence-modules/flyway-repair/README.MD create mode 100644 persistence-modules/flyway-repair/docker-compose/.env create mode 100644 persistence-modules/flyway-repair/docker-compose/docker-compose.yaml create mode 100644 persistence-modules/flyway-repair/docker-compose/mysql.env create mode 100644 persistence-modules/flyway-repair/docker-compose/postgres.env create mode 100644 persistence-modules/flyway-repair/pom.xml create mode 100644 persistence-modules/flyway-repair/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java create mode 100644 persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties create mode 100644 persistence-modules/flyway-repair/src/main/resources/application-h2.properties create mode 100644 persistence-modules/flyway-repair/src/main/resources/application-mysql.properties create mode 100644 persistence-modules/flyway-repair/src/main/resources/application-postgres.properties create mode 100644 persistence-modules/flyway-repair/src/main/resources/application.properties create mode 100644 persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql create mode 100644 persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql create mode 100644 persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql create mode 100644 persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql create mode 100644 persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql create mode 100644 persistence-modules/flyway-repair/src/main/resources/logback.xml diff --git a/persistence-modules/flyway-repair/README.MD b/persistence-modules/flyway-repair/README.MD new file mode 100644 index 0000000000..daeb9012b5 --- /dev/null +++ b/persistence-modules/flyway-repair/README.MD @@ -0,0 +1,3 @@ +### Relevant Articles: +- [Database Migrations with Flyway](http://www.baeldung.com/database-migrations-with-flyway) +- [A Guide to Flyway Callbacks](http://www.baeldung.com/flyway-callbacks) diff --git a/persistence-modules/flyway-repair/docker-compose/.env b/persistence-modules/flyway-repair/docker-compose/.env new file mode 100644 index 0000000000..52bd0d6510 --- /dev/null +++ b/persistence-modules/flyway-repair/docker-compose/.env @@ -0,0 +1,2 @@ +MYSQL_PORT=3316 +POSTGRES_PORT=5431 \ No newline at end of file diff --git a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml new file mode 100644 index 0000000000..23270c043d --- /dev/null +++ b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml @@ -0,0 +1,23 @@ +version: '3.0' + +services: + mysql-test: + image: mysql:8.0.17 + ports: + - ${MYSQL_PORT}:3306 + env_file: + - mysql.env + networks: + - baeldung + + postgres-test: + image: postgres:11.5 + ports: + - ${POSTGRES_PORT}:5432 + env_file: postgres.env + networks: + - baeldung + +networks: + baeldung: + driver: bridge \ No newline at end of file diff --git a/persistence-modules/flyway-repair/docker-compose/mysql.env b/persistence-modules/flyway-repair/docker-compose/mysql.env new file mode 100644 index 0000000000..597344d88c --- /dev/null +++ b/persistence-modules/flyway-repair/docker-compose/mysql.env @@ -0,0 +1,5 @@ +MYSQL_ROOT_PASSWORD=password +MYSQL_RANDOM_ROOT_PASSWORD=yes +MYSQL_USER=testuser +MYSQL_PASSWORD=password +MYSQL_DATABASE=testdb \ No newline at end of file diff --git a/persistence-modules/flyway-repair/docker-compose/postgres.env b/persistence-modules/flyway-repair/docker-compose/postgres.env new file mode 100644 index 0000000000..1e7373fdf0 --- /dev/null +++ b/persistence-modules/flyway-repair/docker-compose/postgres.env @@ -0,0 +1,3 @@ +POSTGRES_USER=testuser +POSTGRES_PASSWORD=password +POSTGRES_DB=testdb diff --git a/persistence-modules/flyway-repair/pom.xml b/persistence-modules/flyway-repair/pom.xml new file mode 100644 index 0000000000..f9d62d5dad --- /dev/null +++ b/persistence-modules/flyway-repair/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + flyway + flyway-repair + jar + Flyway Repair Demo + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + + + + org.flywaydb + flyway-core + ${flyway-core.version} + + + org.springframework.boot + spring-boot-starter-jdbc + + + + + + + org.flywaydb + flyway-maven-plugin + ${flyway-maven-plugin.version} + + + org.springframework.boot + spring-boot-maven-plugin + + + + + true + src/main/resources + + *.properties + db/**/*.sql + + + + + + + 6.5.0 + 6.5.0 + src/main/resources/application-${db.engine}.properties + + + + + + h2 + + h2 + + + + com.h2database + h2 + runtime + + + + + + mysql + + mysql + + + + mysql + mysql-connector-java + runtime + + + + + + postgres + + postgres + + + + org.postgresql + postgresql + runtime + + + + + + + diff --git a/persistence-modules/flyway-repair/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java b/persistence-modules/flyway-repair/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java new file mode 100644 index 0000000000..34d794f7d1 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.flywaycallbacks; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FlywayApplication { + + public static void main(String[] args) { + SpringApplication.run(FlywayApplication.class, args); + } + +} diff --git a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties new file mode 100644 index 0000000000..2c10fc711f --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties @@ -0,0 +1 @@ +flyway.locations=db/migration,db/callbacks \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application-h2.properties b/persistence-modules/flyway-repair/src/main/resources/application-h2.properties new file mode 100644 index 0000000000..15bd482adf --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/application-h2.properties @@ -0,0 +1,3 @@ +flyway.url=jdbc:h2:file:./testdb;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE;MODE=MySQL;DATABASE_TO_UPPER=false; +flyway.user=testuser +flyway.password=password \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties b/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties new file mode 100644 index 0000000000..341f978068 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties @@ -0,0 +1,3 @@ +flyway.url=jdbc:mysql://127.0.0.1:3316/testdb +flyway.user=testuser +flyway.password=password \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties b/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties new file mode 100644 index 0000000000..5afaca96b5 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties @@ -0,0 +1,3 @@ +flyway.url=jdbc:postgresql://127.0.0.1:5431/testdb +flyway.user=testuser +flyway.password=password \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application.properties b/persistence-modules/flyway-repair/src/main/resources/application.properties new file mode 100644 index 0000000000..3fae835eb1 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/application.properties @@ -0,0 +1,6 @@ +spring.profiles.include=@db.engine@ + +spring.datasource.url=${flyway.url} +spring.datasource.username=${flyway.user} +spring.datasource.password=${flyway.password} +spring.flyway.locations=${flyway.locations:db/migration} \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql b/persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql new file mode 100644 index 0000000000..c975e85056 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql @@ -0,0 +1 @@ +DELETE FROM flyway_schema_history WHERE success=false; \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql new file mode 100644 index 0000000000..ec434dd5b2 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql @@ -0,0 +1,3 @@ +create table table_one ( + id numeric primary key +); \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql new file mode 100644 index 0000000000..48720d59d6 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql @@ -0,0 +1,3 @@ +create table table_two ( + id numeric primary key +); \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql new file mode 100644 index 0000000000..1917c88b9b --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql @@ -0,0 +1,3 @@ +create table table_three ( + id numeric primary key +); \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql new file mode 100644 index 0000000000..ec434dd5b2 --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql @@ -0,0 +1,3 @@ +create table table_one ( + id numeric primary key +); \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/logback.xml b/persistence-modules/flyway-repair/src/main/resources/logback.xml new file mode 100644 index 0000000000..56af2d397e --- /dev/null +++ b/persistence-modules/flyway-repair/src/main/resources/logback.xml @@ -0,0 +1,19 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + + + + + + + + \ No newline at end of file From 46654b61acf7eeb372a4d632f363f7c859964935 Mon Sep 17 00:00:00 2001 From: Adrian Maghear Date: Fri, 17 Jul 2020 15:13:57 +0200 Subject: [PATCH 2/4] [BAEL4288] remove mysql flow --- .../flyway-repair/docker-compose/.env | 1 - .../docker-compose/docker-compose.yaml | 8 ---- .../flyway-repair/docker-compose/mysql.env | 5 --- persistence-modules/flyway-repair/pom.xml | 43 ++++--------------- .../application-callbacks.properties | 2 +- .../resources/application-mysql.properties | 3 -- .../src/main/resources/application.properties | 3 -- .../afterMigrateError__repair.sql} | 0 ..._add_table_one.sql => V1_0__add_table.sql} | 0 ..._add_table_two.sql => V1_1__add_table.sql} | 0 ...dd_table_three.sql => V1_2__add_table.sql} | 0 .../db/migration/V1_3__add_table.sql | 2 +- 12 files changed, 11 insertions(+), 56 deletions(-) delete mode 100644 persistence-modules/flyway-repair/docker-compose/mysql.env delete mode 100644 persistence-modules/flyway-repair/src/main/resources/application-mysql.properties rename persistence-modules/flyway-repair/src/main/resources/db/{callbacks/afterMigrateError.sql => callback/afterMigrateError__repair.sql} (100%) rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_0__add_table_one.sql => V1_0__add_table.sql} (100%) rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_1__add_table_two.sql => V1_1__add_table.sql} (100%) rename persistence-modules/flyway-repair/src/main/resources/db/migration/{V1_2__add_table_three.sql => V1_2__add_table.sql} (100%) diff --git a/persistence-modules/flyway-repair/docker-compose/.env b/persistence-modules/flyway-repair/docker-compose/.env index 52bd0d6510..69785c6e5c 100644 --- a/persistence-modules/flyway-repair/docker-compose/.env +++ b/persistence-modules/flyway-repair/docker-compose/.env @@ -1,2 +1 @@ -MYSQL_PORT=3316 POSTGRES_PORT=5431 \ No newline at end of file diff --git a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml index 23270c043d..b3502f8775 100644 --- a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml +++ b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml @@ -1,14 +1,6 @@ version: '3.0' services: - mysql-test: - image: mysql:8.0.17 - ports: - - ${MYSQL_PORT}:3306 - env_file: - - mysql.env - networks: - - baeldung postgres-test: image: postgres:11.5 diff --git a/persistence-modules/flyway-repair/docker-compose/mysql.env b/persistence-modules/flyway-repair/docker-compose/mysql.env deleted file mode 100644 index 597344d88c..0000000000 --- a/persistence-modules/flyway-repair/docker-compose/mysql.env +++ /dev/null @@ -1,5 +0,0 @@ -MYSQL_ROOT_PASSWORD=password -MYSQL_RANDOM_ROOT_PASSWORD=yes -MYSQL_USER=testuser -MYSQL_PASSWORD=password -MYSQL_DATABASE=testdb \ No newline at end of file diff --git a/persistence-modules/flyway-repair/pom.xml b/persistence-modules/flyway-repair/pom.xml index f9d62d5dad..4d61bd5c0e 100644 --- a/persistence-modules/flyway-repair/pom.xml +++ b/persistence-modules/flyway-repair/pom.xml @@ -18,7 +18,6 @@ org.flywaydb flyway-core - ${flyway-core.version} org.springframework.boot @@ -31,37 +30,23 @@ org.flywaydb flyway-maven-plugin - ${flyway-maven-plugin.version} org.springframework.boot spring-boot-maven-plugin - - - true - src/main/resources - - *.properties - db/**/*.sql - - - - - 6.5.0 - 6.5.0 - src/main/resources/application-${db.engine}.properties - - h2 + + true + - h2 + h2 @@ -72,24 +57,10 @@ - - mysql - - mysql - - - - mysql - mysql-connector-java - runtime - - - - postgres - postgres + postgres @@ -102,4 +73,8 @@ + + src/main/resources/application-${spring-boot.run.profiles}.properties + + diff --git a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties index 2c10fc711f..7fb3124764 100644 --- a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties +++ b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties @@ -1 +1 @@ -flyway.locations=db/migration,db/callbacks \ No newline at end of file +spring.flyway.locations=classpath:db/migration,classpath:db/callback \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties b/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties deleted file mode 100644 index 341f978068..0000000000 --- a/persistence-modules/flyway-repair/src/main/resources/application-mysql.properties +++ /dev/null @@ -1,3 +0,0 @@ -flyway.url=jdbc:mysql://127.0.0.1:3316/testdb -flyway.user=testuser -flyway.password=password \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/application.properties b/persistence-modules/flyway-repair/src/main/resources/application.properties index 3fae835eb1..da666d3cc2 100644 --- a/persistence-modules/flyway-repair/src/main/resources/application.properties +++ b/persistence-modules/flyway-repair/src/main/resources/application.properties @@ -1,6 +1,3 @@ -spring.profiles.include=@db.engine@ - spring.datasource.url=${flyway.url} spring.datasource.username=${flyway.user} spring.datasource.password=${flyway.password} -spring.flyway.locations=${flyway.locations:db/migration} \ No newline at end of file diff --git a/persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql b/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql similarity index 100% rename from persistence-modules/flyway-repair/src/main/resources/db/callbacks/afterMigrateError.sql rename to persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql similarity index 100% rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table_one.sql rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql similarity index 100% rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table_two.sql rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql similarity index 100% rename from persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table_three.sql rename to persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql index ec434dd5b2..cf89d5f308 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql @@ -1,3 +1,3 @@ -create table table_one ( +create table table_four ( id numeric primary key ); \ No newline at end of file From 89c430a16720351dcdac60da6d4039dd40f3d565 Mon Sep 17 00:00:00 2001 From: Adrian Maghear Date: Fri, 17 Jul 2020 15:32:41 +0200 Subject: [PATCH 3/4] [BAEL4288] small fixes --- persistence-modules/flyway-repair/README.MD | 3 +-- persistence-modules/flyway-repair/docker-compose/.env | 2 +- .../flyway-repair/docker-compose/docker-compose.yaml | 2 +- .../src/main/resources/application-callbacks.properties | 2 +- .../flyway-repair/src/main/resources/application-h2.properties | 2 +- .../src/main/resources/application-postgres.properties | 2 +- .../main/resources/db/callback/afterMigrateError__repair.sql | 2 +- .../src/main/resources/db/migration/V1_0__add_table.sql | 2 +- .../src/main/resources/db/migration/V1_1__add_table.sql | 2 +- .../src/main/resources/db/migration/V1_2__add_table.sql | 2 +- .../src/main/resources/db/migration/V1_3__add_table.sql | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/persistence-modules/flyway-repair/README.MD b/persistence-modules/flyway-repair/README.MD index daeb9012b5..ca029e8299 100644 --- a/persistence-modules/flyway-repair/README.MD +++ b/persistence-modules/flyway-repair/README.MD @@ -1,3 +1,2 @@ ### Relevant Articles: -- [Database Migrations with Flyway](http://www.baeldung.com/database-migrations-with-flyway) -- [A Guide to Flyway Callbacks](http://www.baeldung.com/flyway-callbacks) +- [Flyway Repair With Spring Boot](http://www.baeldung.com/flyway-repair-with-spring-boot) diff --git a/persistence-modules/flyway-repair/docker-compose/.env b/persistence-modules/flyway-repair/docker-compose/.env index 69785c6e5c..8a9d0e7954 100644 --- a/persistence-modules/flyway-repair/docker-compose/.env +++ b/persistence-modules/flyway-repair/docker-compose/.env @@ -1 +1 @@ -POSTGRES_PORT=5431 \ No newline at end of file +POSTGRES_PORT=5431 diff --git a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml index b3502f8775..b32b48d1cf 100644 --- a/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml +++ b/persistence-modules/flyway-repair/docker-compose/docker-compose.yaml @@ -12,4 +12,4 @@ services: networks: baeldung: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties index 7fb3124764..46ad86afee 100644 --- a/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties +++ b/persistence-modules/flyway-repair/src/main/resources/application-callbacks.properties @@ -1 +1 @@ -spring.flyway.locations=classpath:db/migration,classpath:db/callback \ No newline at end of file +spring.flyway.locations=classpath:db/migration,classpath:db/callback diff --git a/persistence-modules/flyway-repair/src/main/resources/application-h2.properties b/persistence-modules/flyway-repair/src/main/resources/application-h2.properties index 15bd482adf..64e485244e 100644 --- a/persistence-modules/flyway-repair/src/main/resources/application-h2.properties +++ b/persistence-modules/flyway-repair/src/main/resources/application-h2.properties @@ -1,3 +1,3 @@ flyway.url=jdbc:h2:file:./testdb;DB_CLOSE_ON_EXIT=FALSE;AUTO_RECONNECT=TRUE;MODE=MySQL;DATABASE_TO_UPPER=false; flyway.user=testuser -flyway.password=password \ No newline at end of file +flyway.password=password diff --git a/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties b/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties index 5afaca96b5..951f8f583d 100644 --- a/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties +++ b/persistence-modules/flyway-repair/src/main/resources/application-postgres.properties @@ -1,3 +1,3 @@ flyway.url=jdbc:postgresql://127.0.0.1:5431/testdb flyway.user=testuser -flyway.password=password \ No newline at end of file +flyway.password=password diff --git a/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql b/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql index c975e85056..ee0cbb6cee 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/callback/afterMigrateError__repair.sql @@ -1 +1 @@ -DELETE FROM flyway_schema_history WHERE success=false; \ No newline at end of file +DELETE FROM flyway_schema_history WHERE success=false; diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql index ec434dd5b2..1774e837b7 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_0__add_table.sql @@ -1,3 +1,3 @@ create table table_one ( id numeric primary key -); \ No newline at end of file +); diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql index 48720d59d6..76f2ee7ba1 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_1__add_table.sql @@ -1,3 +1,3 @@ create table table_two ( id numeric primary key -); \ No newline at end of file +); diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql index 1917c88b9b..dd5cf34059 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_2__add_table.sql @@ -1,3 +1,3 @@ create table table_three ( id numeric primary key -); \ No newline at end of file +); diff --git a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql index cf89d5f308..4a126ffe33 100644 --- a/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql +++ b/persistence-modules/flyway-repair/src/main/resources/db/migration/V1_3__add_table.sql @@ -1,3 +1,3 @@ create table table_four ( id numeric primary key -); \ No newline at end of file +); From 11e8755339baa026182cddeca9b33f9c051ec2b0 Mon Sep 17 00:00:00 2001 From: Adrian Maghear Date: Tue, 21 Jul 2020 17:08:30 +0200 Subject: [PATCH 4/4] [BAEL-4288] address comments after review --- persistence-modules/flyway-repair/README.MD | 1 - 1 file changed, 1 deletion(-) diff --git a/persistence-modules/flyway-repair/README.MD b/persistence-modules/flyway-repair/README.MD index ca029e8299..7d843af9ea 100644 --- a/persistence-modules/flyway-repair/README.MD +++ b/persistence-modules/flyway-repair/README.MD @@ -1,2 +1 @@ ### Relevant Articles: -- [Flyway Repair With Spring Boot](http://www.baeldung.com/flyway-repair-with-spring-boot)