From 08ca20ff381410713a53352fe32c6ab23fc04488 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Tue, 29 Nov 2022 09:20:56 +0100
Subject: [PATCH] Fixed the test schema name creation and copy env
---
.gitlab-ci.yml | 1 +
.../rest-service/src/test/resources/application.properties | 2 +-
.../rest-service/src/test/resources/application.properties | 2 +-
.../rest-service/src/test/resources/application.properties | 2 +-
.../rest-service/src/test/resources/application.properties | 2 +-
.../rest-service/src/test/resources/application.properties | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7cbe70556..35d4d5b30b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,6 +169,7 @@ build-docker:
- build-backend-table
- build-backend-metadata
script:
+ - cp .env.unix.example .env
- make build-docker
build-frontend:
diff --git a/fda-authentication-service/rest-service/src/test/resources/application.properties b/fda-authentication-service/rest-service/src/test/resources/application.properties
index bcce0036c9..2c7e1df4ae 100644
--- a/fda-authentication-service/rest-service/src/test/resources/application.properties
+++ b/fda-authentication-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/fda-container-service/rest-service/src/test/resources/application.properties b/fda-container-service/rest-service/src/test/resources/application.properties
index efc45ddfe2..92f6e9d907 100644
--- a/fda-container-service/rest-service/src/test/resources/application.properties
+++ b/fda-container-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/fda-database-service/rest-service/src/test/resources/application.properties b/fda-database-service/rest-service/src/test/resources/application.properties
index 2040f94bc4..4547526b4f 100644
--- a/fda-database-service/rest-service/src/test/resources/application.properties
+++ b/fda-database-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/fda-identifier-service/rest-service/src/test/resources/application.properties b/fda-identifier-service/rest-service/src/test/resources/application.properties
index 66bbc59016..507921d77d 100644
--- a/fda-identifier-service/rest-service/src/test/resources/application.properties
+++ b/fda-identifier-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
diff --git a/fda-query-service/rest-service/src/test/resources/application.properties b/fda-query-service/rest-service/src/test/resources/application.properties
index 88c58a85e3..11651224d6 100644
--- a/fda-query-service/rest-service/src/test/resources/application.properties
+++ b/fda-query-service/rest-service/src/test/resources/application.properties
@@ -9,7 +9,7 @@ spring.cloud.config.discovery.enabled = false
spring.cloud.config.enabled = false
# disable datasource
-spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;INIT=CREATE SCHEMA IF NOT EXISTS FDA
spring.datasource.driverClassName=org.h2.Driver
spring.datasource.username=sa
spring.datasource.password=password
--
GitLab