From ce5d2a18020d7c4e81829678a1fa01cceb350769 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 21 Jun 2020 21:20:50 +0400 Subject: [PATCH] db-migrations demos merged in single project --- .../flyway-demo/.gitignore | 0 .../{ => migrations-demo}/flyway-demo/README.md | 0 .../{ => migrations-demo}/flyway-demo/pom.xml | 0 .../AddUsersToCoursesReferenceTable.java | 0 .../V3_1__2020_05_26_Add_courses_table.java | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../java/ru/otus/spring/config/AppConfig.java | 0 .../src/main/resources/application.yaml | 0 .../1.0/V1_1__2019_01_11_Add_users_table.sql | 0 .../1.0/V1_2__2019_01_12_Update_users_table.sql | 0 .../2.0/V2_1__2020_05_25_Add_avatars_table.sql | 0 .../2.0/V2_2__2020_05_25_Add_emails_table.sql | 0 .../src/main/resources/db/migration/README.md | 0 .../db/migration/data/R__0001_Add_users.sql | 0 .../db/migration/data/R__0002_Add_avatars.sql | 0 .../db/migration/data/R__0003_Add_emails.sql | 0 .../db/migration/data/R__0004_Add_courses.sql | 0 .../liquibase-demo/.gitignore | 0 .../liquibase-demo/README.md | 0 .../liquibase-demo/pom.xml | 0 .../src/main/java/ru/otus/spring/Main.java | 0 .../src/main/resources/application.yaml | 0 .../db/changelog/1.0/2019-01-11--0001-user.yaml | 0 .../db/changelog/1.0/2019-01-12--0001-user.yaml | 0 .../changelog/2.0/2020-05-25--0001-avatars.sql | 0 .../changelog/2.0/2020-05-25--0002-emails.json | 0 .../changelog/2.0/2020-05-25--0003-courses.xml | 0 .../data/2019-01-12--0001-user-test-data.yaml | 0 .../data/2020-05-25--0001-test-data.yaml | 0 .../changelog/data/2020-05-25--0002-courses.sql | 0 .../data/data/2019-01-12--0001-users.csv | 0 .../data/data/2020-05-25--0001-avatars.csv | 0 .../data/2020-05-25--0002-users-avatars.csv | 0 .../data/data/2020-05-25--0003-emails.csv | 0 .../db/changelog/db.changelog-master.yaml | 0 examples/migrations-demo/pom.xml | 17 +++++++++++++++++ 36 files changed, 17 insertions(+) rename examples/{ => migrations-demo}/flyway-demo/.gitignore (100%) rename examples/{ => migrations-demo}/flyway-demo/README.md (100%) rename examples/{ => migrations-demo}/flyway-demo/pom.xml (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/java/db/migration/AddUsersToCoursesReferenceTable.java (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/java/db/migration/V3_1__2020_05_26_Add_courses_table.java (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/java/ru/otus/spring/Main.java (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/java/ru/otus/spring/config/AppConfig.java (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/application.yaml (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/1.0/V1_1__2019_01_11_Add_users_table.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/1.0/V1_2__2019_01_12_Update_users_table.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/2.0/V2_1__2020_05_25_Add_avatars_table.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/2.0/V2_2__2020_05_25_Add_emails_table.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/README.md (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/data/R__0001_Add_users.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/data/R__0002_Add_avatars.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/data/R__0003_Add_emails.sql (100%) rename examples/{ => migrations-demo}/flyway-demo/src/main/resources/db/migration/data/R__0004_Add_courses.sql (100%) rename examples/{ => migrations-demo}/liquibase-demo/.gitignore (100%) rename examples/{ => migrations-demo}/liquibase-demo/README.md (100%) rename examples/{ => migrations-demo}/liquibase-demo/pom.xml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/java/ru/otus/spring/Main.java (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/application.yaml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-12--0001-user.yaml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0001-avatars.sql (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0002-emails.json (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0003-courses.xml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/2019-01-12--0001-user-test-data.yaml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0001-test-data.yaml (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0002-courses.sql (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/data/2019-01-12--0001-users.csv (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0001-avatars.csv (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0002-users-avatars.csv (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0003-emails.csv (100%) rename examples/{ => migrations-demo}/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml (100%) create mode 100644 examples/migrations-demo/pom.xml diff --git a/examples/flyway-demo/.gitignore b/examples/migrations-demo/flyway-demo/.gitignore similarity index 100% rename from examples/flyway-demo/.gitignore rename to examples/migrations-demo/flyway-demo/.gitignore diff --git a/examples/flyway-demo/README.md b/examples/migrations-demo/flyway-demo/README.md similarity index 100% rename from examples/flyway-demo/README.md rename to examples/migrations-demo/flyway-demo/README.md diff --git a/examples/flyway-demo/pom.xml b/examples/migrations-demo/flyway-demo/pom.xml similarity index 100% rename from examples/flyway-demo/pom.xml rename to examples/migrations-demo/flyway-demo/pom.xml diff --git a/examples/flyway-demo/src/main/java/db/migration/AddUsersToCoursesReferenceTable.java b/examples/migrations-demo/flyway-demo/src/main/java/db/migration/AddUsersToCoursesReferenceTable.java similarity index 100% rename from examples/flyway-demo/src/main/java/db/migration/AddUsersToCoursesReferenceTable.java rename to examples/migrations-demo/flyway-demo/src/main/java/db/migration/AddUsersToCoursesReferenceTable.java diff --git a/examples/flyway-demo/src/main/java/db/migration/V3_1__2020_05_26_Add_courses_table.java b/examples/migrations-demo/flyway-demo/src/main/java/db/migration/V3_1__2020_05_26_Add_courses_table.java similarity index 100% rename from examples/flyway-demo/src/main/java/db/migration/V3_1__2020_05_26_Add_courses_table.java rename to examples/migrations-demo/flyway-demo/src/main/java/db/migration/V3_1__2020_05_26_Add_courses_table.java diff --git a/examples/flyway-demo/src/main/java/ru/otus/spring/Main.java b/examples/migrations-demo/flyway-demo/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from examples/flyway-demo/src/main/java/ru/otus/spring/Main.java rename to examples/migrations-demo/flyway-demo/src/main/java/ru/otus/spring/Main.java diff --git a/examples/flyway-demo/src/main/java/ru/otus/spring/config/AppConfig.java b/examples/migrations-demo/flyway-demo/src/main/java/ru/otus/spring/config/AppConfig.java similarity index 100% rename from examples/flyway-demo/src/main/java/ru/otus/spring/config/AppConfig.java rename to examples/migrations-demo/flyway-demo/src/main/java/ru/otus/spring/config/AppConfig.java diff --git a/examples/flyway-demo/src/main/resources/application.yaml b/examples/migrations-demo/flyway-demo/src/main/resources/application.yaml similarity index 100% rename from examples/flyway-demo/src/main/resources/application.yaml rename to examples/migrations-demo/flyway-demo/src/main/resources/application.yaml diff --git a/examples/flyway-demo/src/main/resources/db/migration/1.0/V1_1__2019_01_11_Add_users_table.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/1.0/V1_1__2019_01_11_Add_users_table.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/1.0/V1_1__2019_01_11_Add_users_table.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/1.0/V1_1__2019_01_11_Add_users_table.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/1.0/V1_2__2019_01_12_Update_users_table.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/1.0/V1_2__2019_01_12_Update_users_table.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/1.0/V1_2__2019_01_12_Update_users_table.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/1.0/V1_2__2019_01_12_Update_users_table.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/2.0/V2_1__2020_05_25_Add_avatars_table.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/2.0/V2_1__2020_05_25_Add_avatars_table.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/2.0/V2_1__2020_05_25_Add_avatars_table.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/2.0/V2_1__2020_05_25_Add_avatars_table.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/2.0/V2_2__2020_05_25_Add_emails_table.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/2.0/V2_2__2020_05_25_Add_emails_table.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/2.0/V2_2__2020_05_25_Add_emails_table.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/2.0/V2_2__2020_05_25_Add_emails_table.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/README.md b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/README.md similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/README.md rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/README.md diff --git a/examples/flyway-demo/src/main/resources/db/migration/data/R__0001_Add_users.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0001_Add_users.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/data/R__0001_Add_users.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0001_Add_users.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/data/R__0002_Add_avatars.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0002_Add_avatars.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/data/R__0002_Add_avatars.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0002_Add_avatars.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/data/R__0003_Add_emails.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0003_Add_emails.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/data/R__0003_Add_emails.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0003_Add_emails.sql diff --git a/examples/flyway-demo/src/main/resources/db/migration/data/R__0004_Add_courses.sql b/examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0004_Add_courses.sql similarity index 100% rename from examples/flyway-demo/src/main/resources/db/migration/data/R__0004_Add_courses.sql rename to examples/migrations-demo/flyway-demo/src/main/resources/db/migration/data/R__0004_Add_courses.sql diff --git a/examples/liquibase-demo/.gitignore b/examples/migrations-demo/liquibase-demo/.gitignore similarity index 100% rename from examples/liquibase-demo/.gitignore rename to examples/migrations-demo/liquibase-demo/.gitignore diff --git a/examples/liquibase-demo/README.md b/examples/migrations-demo/liquibase-demo/README.md similarity index 100% rename from examples/liquibase-demo/README.md rename to examples/migrations-demo/liquibase-demo/README.md diff --git a/examples/liquibase-demo/pom.xml b/examples/migrations-demo/liquibase-demo/pom.xml similarity index 100% rename from examples/liquibase-demo/pom.xml rename to examples/migrations-demo/liquibase-demo/pom.xml diff --git a/examples/liquibase-demo/src/main/java/ru/otus/spring/Main.java b/examples/migrations-demo/liquibase-demo/src/main/java/ru/otus/spring/Main.java similarity index 100% rename from examples/liquibase-demo/src/main/java/ru/otus/spring/Main.java rename to examples/migrations-demo/liquibase-demo/src/main/java/ru/otus/spring/Main.java diff --git a/examples/liquibase-demo/src/main/resources/application.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/application.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/application.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/application.yaml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-11--0001-user.yaml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-12--0001-user.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-12--0001-user.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-12--0001-user.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/1.0/2019-01-12--0001-user.yaml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0001-avatars.sql b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0001-avatars.sql similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0001-avatars.sql rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0001-avatars.sql diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0002-emails.json b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0002-emails.json similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0002-emails.json rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0002-emails.json diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0003-courses.xml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0003-courses.xml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0003-courses.xml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/2.0/2020-05-25--0003-courses.xml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/2019-01-12--0001-user-test-data.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2019-01-12--0001-user-test-data.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/2019-01-12--0001-user-test-data.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2019-01-12--0001-user-test-data.yaml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0001-test-data.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0001-test-data.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0001-test-data.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0001-test-data.yaml diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0002-courses.sql b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0002-courses.sql similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0002-courses.sql rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/2020-05-25--0002-courses.sql diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/data/2019-01-12--0001-users.csv b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2019-01-12--0001-users.csv similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/data/2019-01-12--0001-users.csv rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2019-01-12--0001-users.csv diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0001-avatars.csv b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0001-avatars.csv similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0001-avatars.csv rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0001-avatars.csv diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0002-users-avatars.csv b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0002-users-avatars.csv similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0002-users-avatars.csv rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0002-users-avatars.csv diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0003-emails.csv b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0003-emails.csv similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0003-emails.csv rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/data/data/2020-05-25--0003-emails.csv diff --git a/examples/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml b/examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml similarity index 100% rename from examples/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml rename to examples/migrations-demo/liquibase-demo/src/main/resources/db/changelog/db.changelog-master.yaml diff --git a/examples/migrations-demo/pom.xml b/examples/migrations-demo/pom.xml new file mode 100644 index 00000000..51492b9b --- /dev/null +++ b/examples/migrations-demo/pom.xml @@ -0,0 +1,17 @@ + + + 4.0.0 + + ru.otus + migrations-demo + 1.0 + + pom + + + liquibase-demo + flyway-demo + +