From 684be19617a67347c8e7e4d37d9160e019ef0422 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 26 Oct 2023 12:58:42 +0200 Subject: [PATCH 1/7] Generate current model changes into db/changelog/dev --- srv/pom.xml | 3 +++ srv/src/main/resources/application.yaml | 1 + srv/src/main/resources/db/changelog/.gitignore | 3 ++- .../main/resources/db/changelog/db.changelog-master.yaml | 9 ++++++++- .../java/my/bookshop/config/DatabaseConfiguration.java | 2 -- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/srv/pom.xml b/srv/pom.xml index 11052bbd..608a677e 100644 --- a/srv/pom.xml +++ b/srv/pom.xml @@ -168,6 +168,9 @@ build --for java + deploy --profile pg --dry --delta-from srv/src/main/resources/db/changelog/v2/model.csn > + srv/src/main/resources/db/changelog/dev/model.sql + deploy --model-only --dry > srv/src/main/resources/db/changelog/dev/model.csn diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 5f24857a..0dc3f4d5 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -3,6 +3,7 @@ my.bookshop.postgresImage: postgres:13 spring: web.resources.static-locations: "file:./app" + devtools.restart.trigger-file: ".reloadtrigger" cds: dataSource.csv: diff --git a/srv/src/main/resources/db/changelog/.gitignore b/srv/src/main/resources/db/changelog/.gitignore index 362b4e3c..7658ed91 100644 --- a/srv/src/main/resources/db/changelog/.gitignore +++ b/srv/src/main/resources/db/changelog/.gitignore @@ -1,2 +1,3 @@ !*.sql -!*.json \ No newline at end of file +!*.json +/dev/ diff --git a/srv/src/main/resources/db/changelog/db.changelog-master.yaml b/srv/src/main/resources/db/changelog/db.changelog-master.yaml index 18b16267..0effa9ab 100644 --- a/srv/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/srv/src/main/resources/db/changelog/db.changelog-master.yaml @@ -12,4 +12,11 @@ databaseChangeLog: changes: - sqlFile: dbms: postgresql - path: db/changelog/v2/model.sql \ No newline at end of file + path: db/changelog/v2/model.sql + - changeSet: + id: "current development" + author: CAP Java + changes: + - sqlFile: + dbms: postgresql + path: db/changelog/dev/model.sql \ No newline at end of file diff --git a/srv/src/test/java/my/bookshop/config/DatabaseConfiguration.java b/srv/src/test/java/my/bookshop/config/DatabaseConfiguration.java index 03403033..7fb12857 100644 --- a/srv/src/test/java/my/bookshop/config/DatabaseConfiguration.java +++ b/srv/src/test/java/my/bookshop/config/DatabaseConfiguration.java @@ -3,7 +3,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.devtools.restart.RestartScope; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,7 +16,6 @@ public class DatabaseConfiguration { @Bean @ServiceConnection - @RestartScope PostgreSQLContainer postgresContainer(@Value("${my.bookshop.postgres-image}") String imageName) { DockerImageName image = DockerImageName.parse(imageName).asCompatibleSubstituteFor(POSTGRES); return new PostgreSQLContainer<>(image) From d7f311b062da5a516b4044311c06b52f0de11044 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 26 Oct 2023 13:11:18 +0200 Subject: [PATCH 2/7] changed id --- srv/src/main/resources/db/changelog/db.changelog-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srv/src/main/resources/db/changelog/db.changelog-master.yaml b/srv/src/main/resources/db/changelog/db.changelog-master.yaml index 0effa9ab..252f45b8 100644 --- a/srv/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/srv/src/main/resources/db/changelog/db.changelog-master.yaml @@ -14,7 +14,7 @@ databaseChangeLog: dbms: postgresql path: db/changelog/v2/model.sql - changeSet: - id: "current development" + id: "development" author: CAP Java changes: - sqlFile: From a35af2c14431bcc4919285267d458efef068aadc Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Thu, 26 Oct 2023 17:26:15 +0200 Subject: [PATCH 3/7] reverted change in application.yaml --- srv/src/main/resources/application.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 0dc3f4d5..5f24857a 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -3,7 +3,6 @@ my.bookshop.postgresImage: postgres:13 spring: web.resources.static-locations: "file:./app" - devtools.restart.trigger-file: ".reloadtrigger" cds: dataSource.csv: From 891abb053991df3d75722d63242a410ffaa01fc8 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Fri, 27 Oct 2023 09:25:14 +0200 Subject: [PATCH 4/7] use dev context --- srv/src/main/resources/db/changelog/db.changelog-master.yaml | 1 + srv/src/test/resources/application.yaml | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 srv/src/test/resources/application.yaml diff --git a/srv/src/main/resources/db/changelog/db.changelog-master.yaml b/srv/src/main/resources/db/changelog/db.changelog-master.yaml index 252f45b8..82d5dd0f 100644 --- a/srv/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/srv/src/main/resources/db/changelog/db.changelog-master.yaml @@ -16,6 +16,7 @@ databaseChangeLog: - changeSet: id: "development" author: CAP Java + context: dev changes: - sqlFile: dbms: postgresql diff --git a/srv/src/test/resources/application.yaml b/srv/src/test/resources/application.yaml new file mode 100644 index 00000000..64e2083f --- /dev/null +++ b/srv/src/test/resources/application.yaml @@ -0,0 +1,5 @@ +--- +my.bookshop.postgresImage: postgres:13 + +spring: + liquibase.contexts: dev From 81c3d3d0558e74fb2252c664329e2fb381137639 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Fri, 27 Oct 2023 09:31:47 +0200 Subject: [PATCH 5/7] change to contextFilter --- srv/src/main/resources/db/changelog/db.changelog-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srv/src/main/resources/db/changelog/db.changelog-master.yaml b/srv/src/main/resources/db/changelog/db.changelog-master.yaml index 82d5dd0f..6f4f922f 100644 --- a/srv/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/srv/src/main/resources/db/changelog/db.changelog-master.yaml @@ -16,7 +16,7 @@ databaseChangeLog: - changeSet: id: "development" author: CAP Java - context: dev + contextFilter: dev changes: - sqlFile: dbms: postgresql From 9a0d1c2e65b19e9ee5a58fe06ddd0c650abebfca Mon Sep 17 00:00:00 2001 From: Vladimir Mikhaylenko Date: Fri, 27 Oct 2023 10:03:58 +0200 Subject: [PATCH 6/7] Adjust /dev setup --- srv/src/main/resources/db/changelog/.gitignore | 4 +++- srv/src/main/resources/db/changelog/dev/.keep | 0 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 srv/src/main/resources/db/changelog/dev/.keep diff --git a/srv/src/main/resources/db/changelog/.gitignore b/srv/src/main/resources/db/changelog/.gitignore index 7658ed91..32f164cf 100644 --- a/srv/src/main/resources/db/changelog/.gitignore +++ b/srv/src/main/resources/db/changelog/.gitignore @@ -1,3 +1,5 @@ !*.sql !*.json -/dev/ +/dev/*.sql +/dev/*.csn +/dev/*.json diff --git a/srv/src/main/resources/db/changelog/dev/.keep b/srv/src/main/resources/db/changelog/dev/.keep new file mode 100644 index 00000000..e69de29b From fed4eb990a45ca2f01a5d4d87786b4f41ddbc182 Mon Sep 17 00:00:00 2001 From: Markus Ofterdinger Date: Fri, 27 Oct 2023 13:01:34 +0200 Subject: [PATCH 7/7] removed test application.yaml --- srv/src/main/resources/application.yaml | 4 +++- srv/src/test/resources/application.yaml | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 srv/src/test/resources/application.yaml diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 5f24857a..7a9730e1 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -20,11 +20,13 @@ cds: --- spring: config.activate.on-profile: cloud + liquibase.contexts: "!dev" --- spring: config.activate.on-profile: default + liquibase.contexts: "dev" cds: dataSource: auto-config.enabled: false - + diff --git a/srv/src/test/resources/application.yaml b/srv/src/test/resources/application.yaml deleted file mode 100644 index 64e2083f..00000000 --- a/srv/src/test/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -my.bookshop.postgresImage: postgres:13 - -spring: - liquibase.contexts: dev