From b63e1f2975e0d801c711ec2d469a11c9eedc3b57 Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Mon, 22 Mar 2021 19:02:18 +0300 Subject: [PATCH 1/3] Moved migration script to eventuate-common. --- _build-and-test-all.sh | 16 ++-------------- gradle.properties | 2 ++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index 9c387b3d..1d6ec0cf 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -29,20 +29,8 @@ ${dockerall}Up ./wait-for-services.sh localhost readers/${READER}/finished "8099" -migration_file="migration_scripts/${DATABASE}/migration.sql" - -rm -f $migration_file -if [ "${DATABASE}" == "mysql" ]; then - curl https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/wip-db-id-gen/mysql/4.initialize-database-db-id.sql --output $migration_file --create-dirs - cat $migration_file | ./mysql-cli.sh -i -elif [ "${DATABASE}" == "postgres" ]; then - curl https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/wip-db-id-gen/postgres/5.initialize-database-db-id.sql --output $migration_file --create-dirs - cat $migration_file | ./postgres-cli.sh -i -else - echo "Unknown Database" - exit 99 -fi -rm -f $migration_file +export db_id_migration_repository=https://raw.githubusercontent.com/eventuate-foundation/eventuate-common +curl -s https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/master/migration/db-id/mssql/migration.sh &> /dev/stdout | bash ${dockerall}Up -P envFile=docker-compose-env-files/db-id-gen.env diff --git a/gradle.properties b/gradle.properties index 5adfd937..73528f15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,6 @@ eventuatePlatformVersion=2020.4.BUILD-SNAPSHOT swaggerUiVersion=3.23.11 eventuateExamplesBaseImageVersion=BUILD-5 +eventuateCommonVersion=0.13.0.RELEASE + version=0.1.0-SNAPSHOT From 9793d2ff403980d268a0dda3438002954cfd6c52 Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Mon, 22 Mar 2021 20:39:06 +0300 Subject: [PATCH 2/3] Fixed eventuate-common-version. --- _build-and-test-all.sh | 5 +++-- gradle.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/_build-and-test-all.sh b/_build-and-test-all.sh index 1d6ec0cf..5cb504a5 100755 --- a/_build-and-test-all.sh +++ b/_build-and-test-all.sh @@ -29,8 +29,9 @@ ${dockerall}Up ./wait-for-services.sh localhost readers/${READER}/finished "8099" -export db_id_migration_repository=https://raw.githubusercontent.com/eventuate-foundation/eventuate-common -curl -s https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/master/migration/db-id/mssql/migration.sh &> /dev/stdout | bash + +curl -s https://raw.githubusercontent.com/eventuate-foundation/eventuate-common/master/migration/db-id/migration.sh &> /dev/stdout | bash + ${dockerall}Up -P envFile=docker-compose-env-files/db-id-gen.env diff --git a/gradle.properties b/gradle.properties index 73528f15..66798a7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,6 +20,6 @@ eventuatePlatformVersion=2020.4.BUILD-SNAPSHOT swaggerUiVersion=3.23.11 eventuateExamplesBaseImageVersion=BUILD-5 -eventuateCommonVersion=0.13.0.RELEASE +eventuateCommonVersion=0.13.0.BUILD-SNAPSHOT version=0.1.0-SNAPSHOT From c1fb8a839405c3f31eaa6d0939f5bb6e367c6e0f Mon Sep 17 00:00:00 2001 From: Artem Sidorkin Date: Tue, 23 Mar 2021 14:58:19 +0300 Subject: [PATCH 3/3] Updated .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e34415a6..733f7b0c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ build/ *.idea/ *.iml *.log - +tmp-migration out