From 009940e266fd383f0dfef051f7b9eb76be630303 Mon Sep 17 00:00:00 2001 From: barrfalk Date: Mon, 15 Jul 2024 11:13:52 -0700 Subject: [PATCH] Cleaned up migrations folders and docker-compose --- docker-compose.yml | 6 +++--- {backend/db => migrations}/Dockerfile | 0 {backend/db => migrations}/migrations/R__0.10.0__CE-216.sql | 0 {backend/db => migrations}/migrations/R__0.10.1__CE-216.sql | 0 {backend/db => migrations}/migrations/R__0.10.2__CE-216.sql | 0 {backend/db => migrations}/migrations/R__0.10.3__CE-216.sql | 0 {backend/db => migrations}/migrations/R__0.14.0__CE-101.sql | 0 .../migrations/R__0.19.2__log_complaint_update.sql | 0 .../R__0.19.3__update_complaint_using_webeoc_update.sql | 0 .../R__0.19.4__insert_complaint_update_from_staging.sql | 0 .../R__0.20.0_edit_complaint_using_webeoc_complaint.sql | 0 {backend/db => migrations}/migrations/R__Code-Tables.sql | 0 .../migrations/R__Code-table-description-updates.sql | 0 .../migrations/R__Configuration-values.sql | 0 .../db => migrations}/migrations/R__Create-Test-Data.sql | 0 .../migrations/R__WebEOC-July-ERS-complaints.sql | 0 .../migrations/R__WebEOC-July-HWCR-complaints.sql | 0 .../migrations/R__reset-complaint-templates.sql | 0 .../migrations/R__staging-metadata-mapping.sql | 0 .../R__view-cos-geo-org-flat-vw-definition-update1.sql | 0 .../migrations/R__view-cos-geo-org-flat-vw-definition.sql | 0 {backend/db => migrations}/migrations/V0.12.1__CE-329.sql | 0 {backend/db => migrations}/migrations/V0.13.1__CE-237.sql | 0 {backend/db => migrations}/migrations/V0.14.1__CE-101.sql | 0 {backend/db => migrations}/migrations/V0.15.1__CE-187.sql | 0 {backend/db => migrations}/migrations/V0.19.1__CE-99.sql | 0 {backend/db => migrations}/migrations/V0.19.6__CE-503.sql | 0 .../db => migrations}/migrations/V0.1__org-code-updates.sql | 0 .../db => migrations}/migrations/V0.2.1__COMPENF-268.sql | 0 {backend/db => migrations}/migrations/V0.2.2.sql | 0 .../migrations/V0.2.3__db-audit-history.sql | 0 .../migrations/V0.20.1__CE-157-reset-sequence.sql | 0 {backend/db => migrations}/migrations/V0.20.2__CE-539.sql | 0 {backend/db => migrations}/migrations/V0.20__CE-693.sql | 0 {backend/db => migrations}/migrations/V0.21.1__CE-789.sql | 0 {backend/db => migrations}/migrations/V0.22.1__CE-787.sql | 0 .../migrations/V0.3.1__complaint-assignee.sql | 0 {backend/db => migrations}/migrations/V0.3__COMPENF-35.sql | 0 .../migrations/V0.5.1__remove-audit-guid.sql | 0 .../db => migrations}/migrations/V0.7.1__COMPENF-454.sql | 0 .../db => migrations}/migrations/V0.7.2__configuration.sql | 0 {backend/db => migrations}/migrations/V0.8.2__COMPENF-1.sql | 0 {backend/db => migrations}/migrations/V0.9.1__CE-19.sql | 0 {backend/db => migrations}/migrations/V0.9.2__CE-6.sql | 0 {backend/db => migrations}/migrations/V0.9.3__CE-14.sql | 0 {backend/db => migrations}/migrations/V0__init.sql | 0 .../test-only-migrations/R__Test-Data-Creation.sql | 0 .../test-only-migrations/R__WebEOC-July-ERS-complaints.sql | 0 .../test-only-migrations/R__WebEOC-July-HWCR-complaints.sql | 0 .../test-only-migrations/V0.8.1__COMPENF-880.sql | 0 .../test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql | 0 51 files changed, 3 insertions(+), 3 deletions(-) rename {backend/db => migrations}/Dockerfile (100%) rename {backend/db => migrations}/migrations/R__0.10.0__CE-216.sql (100%) rename {backend/db => migrations}/migrations/R__0.10.1__CE-216.sql (100%) rename {backend/db => migrations}/migrations/R__0.10.2__CE-216.sql (100%) rename {backend/db => migrations}/migrations/R__0.10.3__CE-216.sql (100%) rename {backend/db => migrations}/migrations/R__0.14.0__CE-101.sql (100%) rename {backend/db => migrations}/migrations/R__0.19.2__log_complaint_update.sql (100%) rename {backend/db => migrations}/migrations/R__0.19.3__update_complaint_using_webeoc_update.sql (100%) rename {backend/db => migrations}/migrations/R__0.19.4__insert_complaint_update_from_staging.sql (100%) rename {backend/db => migrations}/migrations/R__0.20.0_edit_complaint_using_webeoc_complaint.sql (100%) rename {backend/db => migrations}/migrations/R__Code-Tables.sql (100%) rename {backend/db => migrations}/migrations/R__Code-table-description-updates.sql (100%) rename {backend/db => migrations}/migrations/R__Configuration-values.sql (100%) rename {backend/db => migrations}/migrations/R__Create-Test-Data.sql (100%) rename {backend/db => migrations}/migrations/R__WebEOC-July-ERS-complaints.sql (100%) rename {backend/db => migrations}/migrations/R__WebEOC-July-HWCR-complaints.sql (100%) rename {backend/db => migrations}/migrations/R__reset-complaint-templates.sql (100%) rename {backend/db => migrations}/migrations/R__staging-metadata-mapping.sql (100%) rename {backend/db => migrations}/migrations/R__view-cos-geo-org-flat-vw-definition-update1.sql (100%) rename {backend/db => migrations}/migrations/R__view-cos-geo-org-flat-vw-definition.sql (100%) rename {backend/db => migrations}/migrations/V0.12.1__CE-329.sql (100%) rename {backend/db => migrations}/migrations/V0.13.1__CE-237.sql (100%) rename {backend/db => migrations}/migrations/V0.14.1__CE-101.sql (100%) rename {backend/db => migrations}/migrations/V0.15.1__CE-187.sql (100%) rename {backend/db => migrations}/migrations/V0.19.1__CE-99.sql (100%) rename {backend/db => migrations}/migrations/V0.19.6__CE-503.sql (100%) rename {backend/db => migrations}/migrations/V0.1__org-code-updates.sql (100%) rename {backend/db => migrations}/migrations/V0.2.1__COMPENF-268.sql (100%) rename {backend/db => migrations}/migrations/V0.2.2.sql (100%) rename {backend/db => migrations}/migrations/V0.2.3__db-audit-history.sql (100%) rename {backend/db => migrations}/migrations/V0.20.1__CE-157-reset-sequence.sql (100%) rename {backend/db => migrations}/migrations/V0.20.2__CE-539.sql (100%) rename {backend/db => migrations}/migrations/V0.20__CE-693.sql (100%) rename {backend/db => migrations}/migrations/V0.21.1__CE-789.sql (100%) rename {backend/db => migrations}/migrations/V0.22.1__CE-787.sql (100%) rename {backend/db => migrations}/migrations/V0.3.1__complaint-assignee.sql (100%) rename {backend/db => migrations}/migrations/V0.3__COMPENF-35.sql (100%) rename {backend/db => migrations}/migrations/V0.5.1__remove-audit-guid.sql (100%) rename {backend/db => migrations}/migrations/V0.7.1__COMPENF-454.sql (100%) rename {backend/db => migrations}/migrations/V0.7.2__configuration.sql (100%) rename {backend/db => migrations}/migrations/V0.8.2__COMPENF-1.sql (100%) rename {backend/db => migrations}/migrations/V0.9.1__CE-19.sql (100%) rename {backend/db => migrations}/migrations/V0.9.2__CE-6.sql (100%) rename {backend/db => migrations}/migrations/V0.9.3__CE-14.sql (100%) rename {backend/db => migrations}/migrations/V0__init.sql (100%) rename {backend/db => migrations}/test-only-migrations/R__Test-Data-Creation.sql (100%) rename {backend/db => migrations}/test-only-migrations/R__WebEOC-July-ERS-complaints.sql (100%) rename {backend/db => migrations}/test-only-migrations/R__WebEOC-July-HWCR-complaints.sql (100%) rename {backend/db => migrations}/test-only-migrations/V0.8.1__COMPENF-880.sql (100%) rename {backend/db => migrations}/test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql (100%) diff --git a/docker-compose.yml b/docker-compose.yml index cd9d9b1cb..ebbe95737 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,15 +30,15 @@ services: - migrate - -outOfOrder=true volumes: - - "./backend/db/migrations:/flyway/sql" - - "./backend/db/test-only-migrations:/flyway/sql-test" + - "./migrations/migrations:/flyway/sql" + - "./migrations/test-only-migrations:/flyway/sql-test" environment: - FLYWAY_URL=jdbc:postgresql://database:5432/postgres - FLYWAY_USER=postgres - FLYWAY_PASSWORD=default - FLYWAY_BASELINE_ON_MIGRATE=true - FLYWAY_DEFAULT_SCHEMA=public - - FLYWAY_LOCATIONS=filesystem:./flyway/sql, filesystem:./flyway/sql-test + - FLYWAY_LOCATIONS=filesystem:./sql, filesystem:./sql-test depends_on: database: condition: service_healthy diff --git a/backend/db/Dockerfile b/migrations/Dockerfile similarity index 100% rename from backend/db/Dockerfile rename to migrations/Dockerfile diff --git a/backend/db/migrations/R__0.10.0__CE-216.sql b/migrations/migrations/R__0.10.0__CE-216.sql similarity index 100% rename from backend/db/migrations/R__0.10.0__CE-216.sql rename to migrations/migrations/R__0.10.0__CE-216.sql diff --git a/backend/db/migrations/R__0.10.1__CE-216.sql b/migrations/migrations/R__0.10.1__CE-216.sql similarity index 100% rename from backend/db/migrations/R__0.10.1__CE-216.sql rename to migrations/migrations/R__0.10.1__CE-216.sql diff --git a/backend/db/migrations/R__0.10.2__CE-216.sql b/migrations/migrations/R__0.10.2__CE-216.sql similarity index 100% rename from backend/db/migrations/R__0.10.2__CE-216.sql rename to migrations/migrations/R__0.10.2__CE-216.sql diff --git a/backend/db/migrations/R__0.10.3__CE-216.sql b/migrations/migrations/R__0.10.3__CE-216.sql similarity index 100% rename from backend/db/migrations/R__0.10.3__CE-216.sql rename to migrations/migrations/R__0.10.3__CE-216.sql diff --git a/backend/db/migrations/R__0.14.0__CE-101.sql b/migrations/migrations/R__0.14.0__CE-101.sql similarity index 100% rename from backend/db/migrations/R__0.14.0__CE-101.sql rename to migrations/migrations/R__0.14.0__CE-101.sql diff --git a/backend/db/migrations/R__0.19.2__log_complaint_update.sql b/migrations/migrations/R__0.19.2__log_complaint_update.sql similarity index 100% rename from backend/db/migrations/R__0.19.2__log_complaint_update.sql rename to migrations/migrations/R__0.19.2__log_complaint_update.sql diff --git a/backend/db/migrations/R__0.19.3__update_complaint_using_webeoc_update.sql b/migrations/migrations/R__0.19.3__update_complaint_using_webeoc_update.sql similarity index 100% rename from backend/db/migrations/R__0.19.3__update_complaint_using_webeoc_update.sql rename to migrations/migrations/R__0.19.3__update_complaint_using_webeoc_update.sql diff --git a/backend/db/migrations/R__0.19.4__insert_complaint_update_from_staging.sql b/migrations/migrations/R__0.19.4__insert_complaint_update_from_staging.sql similarity index 100% rename from backend/db/migrations/R__0.19.4__insert_complaint_update_from_staging.sql rename to migrations/migrations/R__0.19.4__insert_complaint_update_from_staging.sql diff --git a/backend/db/migrations/R__0.20.0_edit_complaint_using_webeoc_complaint.sql b/migrations/migrations/R__0.20.0_edit_complaint_using_webeoc_complaint.sql similarity index 100% rename from backend/db/migrations/R__0.20.0_edit_complaint_using_webeoc_complaint.sql rename to migrations/migrations/R__0.20.0_edit_complaint_using_webeoc_complaint.sql diff --git a/backend/db/migrations/R__Code-Tables.sql b/migrations/migrations/R__Code-Tables.sql similarity index 100% rename from backend/db/migrations/R__Code-Tables.sql rename to migrations/migrations/R__Code-Tables.sql diff --git a/backend/db/migrations/R__Code-table-description-updates.sql b/migrations/migrations/R__Code-table-description-updates.sql similarity index 100% rename from backend/db/migrations/R__Code-table-description-updates.sql rename to migrations/migrations/R__Code-table-description-updates.sql diff --git a/backend/db/migrations/R__Configuration-values.sql b/migrations/migrations/R__Configuration-values.sql similarity index 100% rename from backend/db/migrations/R__Configuration-values.sql rename to migrations/migrations/R__Configuration-values.sql diff --git a/backend/db/migrations/R__Create-Test-Data.sql b/migrations/migrations/R__Create-Test-Data.sql similarity index 100% rename from backend/db/migrations/R__Create-Test-Data.sql rename to migrations/migrations/R__Create-Test-Data.sql diff --git a/backend/db/migrations/R__WebEOC-July-ERS-complaints.sql b/migrations/migrations/R__WebEOC-July-ERS-complaints.sql similarity index 100% rename from backend/db/migrations/R__WebEOC-July-ERS-complaints.sql rename to migrations/migrations/R__WebEOC-July-ERS-complaints.sql diff --git a/backend/db/migrations/R__WebEOC-July-HWCR-complaints.sql b/migrations/migrations/R__WebEOC-July-HWCR-complaints.sql similarity index 100% rename from backend/db/migrations/R__WebEOC-July-HWCR-complaints.sql rename to migrations/migrations/R__WebEOC-July-HWCR-complaints.sql diff --git a/backend/db/migrations/R__reset-complaint-templates.sql b/migrations/migrations/R__reset-complaint-templates.sql similarity index 100% rename from backend/db/migrations/R__reset-complaint-templates.sql rename to migrations/migrations/R__reset-complaint-templates.sql diff --git a/backend/db/migrations/R__staging-metadata-mapping.sql b/migrations/migrations/R__staging-metadata-mapping.sql similarity index 100% rename from backend/db/migrations/R__staging-metadata-mapping.sql rename to migrations/migrations/R__staging-metadata-mapping.sql diff --git a/backend/db/migrations/R__view-cos-geo-org-flat-vw-definition-update1.sql b/migrations/migrations/R__view-cos-geo-org-flat-vw-definition-update1.sql similarity index 100% rename from backend/db/migrations/R__view-cos-geo-org-flat-vw-definition-update1.sql rename to migrations/migrations/R__view-cos-geo-org-flat-vw-definition-update1.sql diff --git a/backend/db/migrations/R__view-cos-geo-org-flat-vw-definition.sql b/migrations/migrations/R__view-cos-geo-org-flat-vw-definition.sql similarity index 100% rename from backend/db/migrations/R__view-cos-geo-org-flat-vw-definition.sql rename to migrations/migrations/R__view-cos-geo-org-flat-vw-definition.sql diff --git a/backend/db/migrations/V0.12.1__CE-329.sql b/migrations/migrations/V0.12.1__CE-329.sql similarity index 100% rename from backend/db/migrations/V0.12.1__CE-329.sql rename to migrations/migrations/V0.12.1__CE-329.sql diff --git a/backend/db/migrations/V0.13.1__CE-237.sql b/migrations/migrations/V0.13.1__CE-237.sql similarity index 100% rename from backend/db/migrations/V0.13.1__CE-237.sql rename to migrations/migrations/V0.13.1__CE-237.sql diff --git a/backend/db/migrations/V0.14.1__CE-101.sql b/migrations/migrations/V0.14.1__CE-101.sql similarity index 100% rename from backend/db/migrations/V0.14.1__CE-101.sql rename to migrations/migrations/V0.14.1__CE-101.sql diff --git a/backend/db/migrations/V0.15.1__CE-187.sql b/migrations/migrations/V0.15.1__CE-187.sql similarity index 100% rename from backend/db/migrations/V0.15.1__CE-187.sql rename to migrations/migrations/V0.15.1__CE-187.sql diff --git a/backend/db/migrations/V0.19.1__CE-99.sql b/migrations/migrations/V0.19.1__CE-99.sql similarity index 100% rename from backend/db/migrations/V0.19.1__CE-99.sql rename to migrations/migrations/V0.19.1__CE-99.sql diff --git a/backend/db/migrations/V0.19.6__CE-503.sql b/migrations/migrations/V0.19.6__CE-503.sql similarity index 100% rename from backend/db/migrations/V0.19.6__CE-503.sql rename to migrations/migrations/V0.19.6__CE-503.sql diff --git a/backend/db/migrations/V0.1__org-code-updates.sql b/migrations/migrations/V0.1__org-code-updates.sql similarity index 100% rename from backend/db/migrations/V0.1__org-code-updates.sql rename to migrations/migrations/V0.1__org-code-updates.sql diff --git a/backend/db/migrations/V0.2.1__COMPENF-268.sql b/migrations/migrations/V0.2.1__COMPENF-268.sql similarity index 100% rename from backend/db/migrations/V0.2.1__COMPENF-268.sql rename to migrations/migrations/V0.2.1__COMPENF-268.sql diff --git a/backend/db/migrations/V0.2.2.sql b/migrations/migrations/V0.2.2.sql similarity index 100% rename from backend/db/migrations/V0.2.2.sql rename to migrations/migrations/V0.2.2.sql diff --git a/backend/db/migrations/V0.2.3__db-audit-history.sql b/migrations/migrations/V0.2.3__db-audit-history.sql similarity index 100% rename from backend/db/migrations/V0.2.3__db-audit-history.sql rename to migrations/migrations/V0.2.3__db-audit-history.sql diff --git a/backend/db/migrations/V0.20.1__CE-157-reset-sequence.sql b/migrations/migrations/V0.20.1__CE-157-reset-sequence.sql similarity index 100% rename from backend/db/migrations/V0.20.1__CE-157-reset-sequence.sql rename to migrations/migrations/V0.20.1__CE-157-reset-sequence.sql diff --git a/backend/db/migrations/V0.20.2__CE-539.sql b/migrations/migrations/V0.20.2__CE-539.sql similarity index 100% rename from backend/db/migrations/V0.20.2__CE-539.sql rename to migrations/migrations/V0.20.2__CE-539.sql diff --git a/backend/db/migrations/V0.20__CE-693.sql b/migrations/migrations/V0.20__CE-693.sql similarity index 100% rename from backend/db/migrations/V0.20__CE-693.sql rename to migrations/migrations/V0.20__CE-693.sql diff --git a/backend/db/migrations/V0.21.1__CE-789.sql b/migrations/migrations/V0.21.1__CE-789.sql similarity index 100% rename from backend/db/migrations/V0.21.1__CE-789.sql rename to migrations/migrations/V0.21.1__CE-789.sql diff --git a/backend/db/migrations/V0.22.1__CE-787.sql b/migrations/migrations/V0.22.1__CE-787.sql similarity index 100% rename from backend/db/migrations/V0.22.1__CE-787.sql rename to migrations/migrations/V0.22.1__CE-787.sql diff --git a/backend/db/migrations/V0.3.1__complaint-assignee.sql b/migrations/migrations/V0.3.1__complaint-assignee.sql similarity index 100% rename from backend/db/migrations/V0.3.1__complaint-assignee.sql rename to migrations/migrations/V0.3.1__complaint-assignee.sql diff --git a/backend/db/migrations/V0.3__COMPENF-35.sql b/migrations/migrations/V0.3__COMPENF-35.sql similarity index 100% rename from backend/db/migrations/V0.3__COMPENF-35.sql rename to migrations/migrations/V0.3__COMPENF-35.sql diff --git a/backend/db/migrations/V0.5.1__remove-audit-guid.sql b/migrations/migrations/V0.5.1__remove-audit-guid.sql similarity index 100% rename from backend/db/migrations/V0.5.1__remove-audit-guid.sql rename to migrations/migrations/V0.5.1__remove-audit-guid.sql diff --git a/backend/db/migrations/V0.7.1__COMPENF-454.sql b/migrations/migrations/V0.7.1__COMPENF-454.sql similarity index 100% rename from backend/db/migrations/V0.7.1__COMPENF-454.sql rename to migrations/migrations/V0.7.1__COMPENF-454.sql diff --git a/backend/db/migrations/V0.7.2__configuration.sql b/migrations/migrations/V0.7.2__configuration.sql similarity index 100% rename from backend/db/migrations/V0.7.2__configuration.sql rename to migrations/migrations/V0.7.2__configuration.sql diff --git a/backend/db/migrations/V0.8.2__COMPENF-1.sql b/migrations/migrations/V0.8.2__COMPENF-1.sql similarity index 100% rename from backend/db/migrations/V0.8.2__COMPENF-1.sql rename to migrations/migrations/V0.8.2__COMPENF-1.sql diff --git a/backend/db/migrations/V0.9.1__CE-19.sql b/migrations/migrations/V0.9.1__CE-19.sql similarity index 100% rename from backend/db/migrations/V0.9.1__CE-19.sql rename to migrations/migrations/V0.9.1__CE-19.sql diff --git a/backend/db/migrations/V0.9.2__CE-6.sql b/migrations/migrations/V0.9.2__CE-6.sql similarity index 100% rename from backend/db/migrations/V0.9.2__CE-6.sql rename to migrations/migrations/V0.9.2__CE-6.sql diff --git a/backend/db/migrations/V0.9.3__CE-14.sql b/migrations/migrations/V0.9.3__CE-14.sql similarity index 100% rename from backend/db/migrations/V0.9.3__CE-14.sql rename to migrations/migrations/V0.9.3__CE-14.sql diff --git a/backend/db/migrations/V0__init.sql b/migrations/migrations/V0__init.sql similarity index 100% rename from backend/db/migrations/V0__init.sql rename to migrations/migrations/V0__init.sql diff --git a/backend/db/test-only-migrations/R__Test-Data-Creation.sql b/migrations/test-only-migrations/R__Test-Data-Creation.sql similarity index 100% rename from backend/db/test-only-migrations/R__Test-Data-Creation.sql rename to migrations/test-only-migrations/R__Test-Data-Creation.sql diff --git a/backend/db/test-only-migrations/R__WebEOC-July-ERS-complaints.sql b/migrations/test-only-migrations/R__WebEOC-July-ERS-complaints.sql similarity index 100% rename from backend/db/test-only-migrations/R__WebEOC-July-ERS-complaints.sql rename to migrations/test-only-migrations/R__WebEOC-July-ERS-complaints.sql diff --git a/backend/db/test-only-migrations/R__WebEOC-July-HWCR-complaints.sql b/migrations/test-only-migrations/R__WebEOC-July-HWCR-complaints.sql similarity index 100% rename from backend/db/test-only-migrations/R__WebEOC-July-HWCR-complaints.sql rename to migrations/test-only-migrations/R__WebEOC-July-HWCR-complaints.sql diff --git a/backend/db/test-only-migrations/V0.8.1__COMPENF-880.sql b/migrations/test-only-migrations/V0.8.1__COMPENF-880.sql similarity index 100% rename from backend/db/test-only-migrations/V0.8.1__COMPENF-880.sql rename to migrations/test-only-migrations/V0.8.1__COMPENF-880.sql diff --git a/backend/db/test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql b/migrations/test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql similarity index 100% rename from backend/db/test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql rename to migrations/test-only-migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql