diff --git a/docker-compose.yml b/docker-compose.yml
index eedeb59f2f4069a4313620224448472f3a58f806..82c862b095e13fe02bfe5f715b8e896bd21b9ba2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,9 +40,9 @@ services:
networks:
core:
volumes:
- - metadata-db-data:/var/lib/postgresql/data
+ - metadata-db-data:/var/lib/mysql
ports:
- - "5432:5432"
+ - "3306:3306"
logging:
driver: json-file
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
index 441da8934f799d8129ff840e743b057b3a8eb522..eaa0435b2793c187ae36d720eaaa2181a7c3cb3d 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-authentication-service/rest-service/src/main/resources/application-local.yml b/fda-authentication-service/rest-service/src/main/resources/application-local.yml
index 95bf2eba31b51743612d0d680ecac54be1e32272..420671411f189b072497813b33cb16ec317bdf66 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://localhost:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-authentication-service/rest-service/src/main/resources/application.yml b/fda-authentication-service/rest-service/src/main/resources/application.yml
index 7b1f6a1cc60912f8fb33bf699302fb21608011bc..a8fd56e659819d2904338c69d69902195d01da45 100644
--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-container-service/rest-service/src/main/resources/application-docker.yml b/fda-container-service/rest-service/src/main/resources/application-docker.yml
index f5efc5076a0c0d086ccbea8632ba36db2b87ff08..24f847776bd85c40448227ab2a065067045003d9 100644
--- a/fda-container-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://fda-metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-container-service/rest-service/src/main/resources/application-local.yml b/fda-container-service/rest-service/src/main/resources/application-local.yml
index 739d44ec5fdd02d3022a540a1cc4472bb01ecac2..99918dae2a0975036b7fbc81dcafb918c9c24872 100644
--- a/fda-container-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://localhost:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-container-service/rest-service/src/main/resources/application.yml b/fda-container-service/rest-service/src/main/resources/application.yml
index 1225af6d05f77fd71ea38e49e13b7655dd156706..e3d7717a3ddc7019a59294b64f9759fbe3fbc878 100644
--- a/fda-container-service/rest-service/src/main/resources/application.yml
+++ b/fda-container-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-database-service/rest-service/src/main/resources/application-docker.yml b/fda-database-service/rest-service/src/main/resources/application-docker.yml
index 046b4830afbfbae7e0ede200a87ddba29f3903a4..576a0422f1b92925fc6d78c1286f9543144f55fc 100644
--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-database-service/rest-service/src/main/resources/application-local.yml b/fda-database-service/rest-service/src/main/resources/application-local.yml
index a61dd2e97279dbfe5b015fc5788c087f90385cac..0a7f5703599f2a16deb0a9d91ad595dc4e926ac5 100644
--- a/fda-database-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-database-service/rest-service/src/main/resources/application.yml b/fda-database-service/rest-service/src/main/resources/application.yml
index 748dcc16681f9222256deabbd9b5603ff488c435..2472179420fefb20335500c21f2d3ffa2d2487ad 100644
--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
index 08df9cacc9bc159841e256e2157f0ae3ee273a77..dfe20bf76800b010660a3171e27791ac3c503b88 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-identifier-service/rest-service/src/main/resources/application-local.yml b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
index 63590d22680698edecf0b66a181f762752626cfb..acb11a960690b56c300a30b9c2674f1d7211ef87 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-identifier-service/rest-service/src/main/resources/application.yml b/fda-identifier-service/rest-service/src/main/resources/application.yml
index f9a20af4033586bdc9826ffe8c0d8ef658b6cea8..8553453894ebb1adcd0855f5f8ece52bf30b5584 100644
--- a/fda-identifier-service/rest-service/src/main/resources/application.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-metadata-db/Dockerfile b/fda-metadata-db/Dockerfile
index 8d14c44ab91c0cb4b74729a7f6fbf7f41a6aa502..5cb120f95a3cc37d159c60117ec3bb3b2dfbbb77 100644
--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -20,9 +20,8 @@ RUN mvn -q clean install > /dev/null
###### SECOND STAGE ######
FROM postgres:14-alpine as runtime
-ENV POSTGRES_DB=fda
-ENV POSTGRES_USER=postgres
-ENV POSTGRES_PASSWORD=postgres
+ENV METADATA_USERNAME=dbrepo
+ENV METADATA_PASSWORD=dbrepo
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD pg_isready
diff --git a/fda-metadata-db/setup-schema.sql b/fda-metadata-db/setup-schema.sql
index 89947b142127325f4df480836a3ca81dd2a2bd46..1e18e92dc340b79a317bcbbf461543486ab6a146 100644
--- a/fda-metadata-db/setup-schema.sql
+++ b/fda-metadata-db/setup-schema.sql
@@ -1,146 +1,125 @@
-CREATE USER root;
-CREATE DATABASE root;
-
BEGIN;
-CREATE
- TYPE gender AS ENUM ('F', 'M', 'T');
-CREATE
- TYPE accesstype AS ENUM ('R', 'W');
-CREATE
- TYPE image_environment_type AS ENUM ('USERNAME', 'PASSWORD', 'PRIVILEGED_USERNAME', 'PRIVILEGED_PASSWORD');
-CREATE
- TYPE role_type AS ENUM ('ROLE_RESEARCHER', 'ROLE_DEVELOPER', 'ROLE_DATA_STEWARD');
-
-CREATE
- CAST
- (character varying AS image_environment_type)
- WITH INOUT AS ASSIGNMENT;
-CREATE
- CAST
- (character varying AS role_type)
- WITH INOUT AS ASSIGNMENT;
-
-CREATE SEQUENCE public.mdb_images_environment_item_seq
+CREATE SEQUENCE mdb_images_environment_item_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_images_seq
+CREATE SEQUENCE mdb_images_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_images_date_seq
+CREATE SEQUENCE mdb_images_date_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_containers_seq
+CREATE SEQUENCE mdb_containers_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_user_seq
+CREATE SEQUENCE mdb_user_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_user_role_seq
+CREATE SEQUENCE mdb_user_role_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_data_seq
+CREATE SEQUENCE mdb_data_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_databases_seq
+CREATE SEQUENCE mdb_databases_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_tables_seq
+CREATE SEQUENCE mdb_tables_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_columns_seq
+CREATE SEQUENCE mdb_columns_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_columns_enum_seq
+CREATE SEQUENCE mdb_columns_enum_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_view_seq
+CREATE SEQUENCE mdb_view_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_columns_concepts_seq
+CREATE SEQUENCE mdb_columns_concepts_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_identifiers_seq
+CREATE SEQUENCE mdb_identifiers_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_related_identifiers_seq
+CREATE SEQUENCE mdb_related_identifiers_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_creators_seq
+CREATE SEQUENCE mdb_creators_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_time_secrets_seq
+CREATE SEQUENCE mdb_time_secrets_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
NO MAXVALUE
CACHE 1;
-CREATE SEQUENCE public.mdb_tokens_seq
+CREATE SEQUENCE mdb_tokens_seq
START WITH 1
INCREMENT BY 1
NO MINVALUE
@@ -149,81 +128,81 @@ CREATE SEQUENCE public.mdb_tokens_seq
CREATE TABLE IF NOT EXISTS mdb_users
(
- UserID bigint not null DEFAULT nextval('mdb_user_seq'),
+ UserID bigint not null DEFAULT nextval(mdb_user_seq),
external_id VARCHAR(255) UNIQUE,
OID bigint,
- username VARCHAR(255) not null,
+ username VARCHAR(255) not null,
First_name VARCHAR(50),
Last_name VARCHAR(50),
- Gender gender,
+ Gender ENUM ('M', 'F', 'D'),
Preceding_titles VARCHAR(255),
Postpositioned_title VARCHAR(255),
orcid VARCHAR(16),
- theme_dark BOOLEAN NOT NULL DEFAULT false,
+ theme_dark BOOLEAN NOT NULL DEFAULT false,
affiliation VARCHAR(255),
- Main_Email VARCHAR(255) not null,
- main_email_verified bool not null default false,
- password VARCHAR(255) not null,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
+ Main_Email VARCHAR(255) not null,
+ main_email_verified bool not null default false,
+ password VARCHAR(255) not null,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
PRIMARY KEY (UserID),
UNIQUE (username),
UNIQUE (Main_Email),
UNIQUE (OID)
);
-CREATE TABLE public.mdb_images
+CREATE TABLE mdb_images
(
- id bigint NOT NULL DEFAULT nextval('mdb_images_seq'),
- repository character varying(255) NOT NULL,
- tag character varying(255) NOT NULL,
- default_port integer NOT NULL,
- dialect character varying(255) NOT NULL,
- driver_class character varying(255) NOT NULL,
- jdbc_method character varying(255) NOT NULL,
- compiled timestamp without time zone,
+ id bigint NOT NULL DEFAULT nextval(mdb_images_seq),
+ repository character varying(255) NOT NULL,
+ tag character varying(255) NOT NULL,
+ default_port integer NOT NULL,
+ dialect character varying(255) NOT NULL,
+ driver_class character varying(255) NOT NULL,
+ jdbc_method character varying(255) NOT NULL,
+ compiled timestamp,
hash character varying(255),
size bigint,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
PRIMARY KEY (id),
UNIQUE (repository, tag)
);
-CREATE TABLE public.mdb_time_secrets
+CREATE TABLE mdb_time_secrets
(
- id bigint not null default nextval('mdb_time_secrets_seq'),
- uid bigint not null,
- token character varying(255) NOT NULL,
- processed boolean NOT NULL default false,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- valid_to timestamp without time zone NOT NULL,
+ id bigint not null default nextval(mdb_time_secrets_seq),
+ uid bigint not null,
+ token character varying(255) NOT NULL,
+ processed boolean NOT NULL default false,
+ created timestamp NOT NULL DEFAULT NOW(),
+ valid_to timestamp NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (uid) REFERENCES mdb_users (UserID)
);
-CREATE TABLE public.mdb_tokens
+CREATE TABLE mdb_tokens
(
- id bigint not null default nextval('mdb_tokens'),
- token_hash varchar(255) NOT NULL,
- creator bigint not null,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- expires timestamp without time zone NOT NULL,
- last_used timestamp without time zone,
- deleted timestamp without time zone,
+ id bigint not null default nextval(mdb_tokens_seq),
+ token_hash varchar(255) NOT NULL,
+ creator bigint not null,
+ created timestamp NOT NULL DEFAULT NOW(),
+ expires timestamp NOT NULL,
+ last_used timestamp,
+ deleted timestamp,
PRIMARY KEY (id),
FOREIGN KEY (creator) REFERENCES mdb_users (UserID)
);
-CREATE TABLE public.mdb_images_date
+CREATE TABLE mdb_images_date
(
- id bigint NOT NULL DEFAULT nextval('mdb_images_date_seq'),
- iid bigint NOT NULL,
- database_format character varying(255) NOT NULL,
- unix_format character varying(255) NOT NULL,
- example character varying(255) NOT NULL,
- has_time boolean NOT NULL,
- created_at timestamp without time zone NOT NULL DEFAULT NOW(),
+ id bigint NOT NULL DEFAULT nextval(mdb_images_date_seq),
+ iid bigint NOT NULL,
+ database_format character varying(255) NOT NULL,
+ unix_format character varying(255) NOT NULL,
+ example character varying(255) NOT NULL,
+ has_time boolean NOT NULL,
+ created_at timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (id),
FOREIGN KEY (iid) REFERENCES mdb_images (id),
UNIQUE (database_format)
@@ -231,38 +210,38 @@ CREATE TABLE public.mdb_images_date
CREATE TABLE IF NOT EXISTS mdb_containers
(
- id bigint NOT NULL DEFAULT nextval('mdb_containers_seq'),
- HASH character varying(255) NOT NULL,
- INTERNAL_NAME character varying(255) NOT NULL,
- NAME character varying(255) NOT NULL,
+ id bigint NOT NULL DEFAULT nextval(mdb_containers_seq),
+ HASH character varying(255) NOT NULL,
+ INTERNAL_NAME character varying(255) NOT NULL,
+ NAME character varying(255) NOT NULL,
PORT integer,
image_id bigint,
ip_address character varying(255),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- created_by bigint NOT NULL,
- LAST_MODIFIED timestamp without time zone,
- deleted timestamp without time zone,
+ created timestamp NOT NULL DEFAULT NOW(),
+ created_by bigint NOT NULL,
+ LAST_MODIFIED timestamp,
+ deleted timestamp,
PRIMARY KEY (id),
- FOREIGN KEY (created_by) REFERENCES mdb_USERS (UserID),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
FOREIGN KEY (image_id) REFERENCES mdb_images (id)
);
-CREATE TABLE public.mdb_images_environment_item
+CREATE TABLE mdb_images_environment_item
(
- id bigint NOT NULL DEFAULT nextval('mdb_images_environment_item_seq'),
- key character varying(255) NOT NULL,
- value character varying(255) NOT NULL,
- etype image_environment_type NOT NULL,
- iid bigint NOT NULL,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
+ id bigint NOT NULL DEFAULT nextval(mdb_images_environment_item_seq),
+ `key` character varying(255) NOT NULL,
+ value character varying(255) NOT NULL,
+ etype ENUM ('PRIVILEGED_USERNAME', 'PRIVILEGED_PASSWORD', 'USERNAME', 'PASSWORD') NOT NULL,
+ iid bigint NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
PRIMARY KEY (id, iid),
FOREIGN KEY (iid) REFERENCES mdb_images (id)
);
CREATE TABLE IF NOT EXISTS mdb_data
(
- ID bigint DEFAULT nextval('mdb_data_seq'),
+ ID bigint DEFAULT nextval(mdb_data_seq),
PROVENANCE TEXT,
FileEncoding TEXT,
FileType VARCHAR(100),
@@ -273,10 +252,10 @@ CREATE TABLE IF NOT EXISTS mdb_data
CREATE TABLE IF NOT EXISTS mdb_user_roles
(
- uid bigint not null,
- role varchar(255) not null,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
+ uid bigint not null,
+ role varchar(255) not null,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
PRIMARY KEY (uid),
FOREIGN KEY (uid) REFERENCES mdb_users (UserID),
UNIQUE (uid, role)
@@ -292,21 +271,21 @@ CREATE TABLE IF NOT EXISTS mdb_licenses
CREATE TABLE IF NOT EXISTS mdb_databases
(
- id bigint NOT NULL DEFAULT nextval('mdb_databases_seq'),
- name character varying(255) NOT NULL,
- internal_name character varying(255) NOT NULL,
- exchange character varying(255) NOT NULL,
+ id bigint NOT NULL DEFAULT nextval(mdb_databases_seq),
+ name character varying(255) NOT NULL,
+ internal_name character varying(255) NOT NULL,
+ exchange character varying(255) NOT NULL,
Description TEXT,
- Engine VARCHAR(20) DEFAULT 'Postgres',
- is_public BOOLEAN NOT NULL DEFAULT TRUE,
+ Engine VARCHAR(20),
+ is_public BOOLEAN NOT NULL DEFAULT TRUE,
Creator BIGINT,
Contactperson BIGINT,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
- deleted timestamp without time zone NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ deleted timestamp NULL,
PRIMARY KEY (id),
- FOREIGN KEY (Creator) REFERENCES mdb_USERS (UserID),
- FOREIGN KEY (Contactperson) REFERENCES mdb_USERS (UserID),
+ FOREIGN KEY (Creator) REFERENCES mdb_users (UserID),
+ FOREIGN KEY (Contactperson) REFERENCES mdb_users (UserID),
FOREIGN KEY (id) REFERENCES mdb_containers (id) /* currently we only support one-to-one */
);
@@ -319,63 +298,63 @@ CREATE TABLE IF NOT EXISTS mdb_databases_subjects
CREATE TABLE IF NOT EXISTS mdb_tables
(
- ID bigint NOT NULL DEFAULT nextval('mdb_tables_seq'),
- tDBID bigint NOT NULL,
- internal_name character varying(255) NOT NULL,
- topic character varying(255) NOT NULL,
+ ID bigint NOT NULL DEFAULT nextval(mdb_tables_seq),
+ tDBID bigint NOT NULL,
+ internal_name character varying(255) NOT NULL,
+ topic character varying(255) NOT NULL,
tName VARCHAR(50),
tDescription TEXT,
NumCols INTEGER,
NumRows INTEGER,
- separator CHAR(1) DEFAULT ',',
+ separator CHAR(1),
quote CHAR(1),
element_null VARCHAR(50),
skip_lines BIGINT,
element_true VARCHAR(50),
element_false VARCHAR(50),
Version TEXT,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- created_by bigint NOT NULL,
- last_modified timestamp without time zone,
+ created timestamp NOT NULL DEFAULT NOW(),
+ created_by bigint NOT NULL,
+ last_modified timestamp,
PRIMARY KEY (tDBID, ID),
- FOREIGN KEY (created_by) REFERENCES mdb_USERS (UserID),
- FOREIGN KEY (tDBID) REFERENCES mdb_DATABASES (id)
+ FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
+ FOREIGN KEY (tDBID) REFERENCES mdb_databases (id)
);
CREATE TABLE IF NOT EXISTS mdb_COLUMNS
(
- ID bigint NOT NULL DEFAULT nextval('mdb_columns_seq'),
- cDBID bigint NOT NULL,
- tID bigint NOT NULL,
+ ID bigint NOT NULL DEFAULT nextval(mdb_columns_seq),
+ cDBID bigint NOT NULL,
+ tID bigint NOT NULL,
dfID bigint,
cName VARCHAR(100),
- internal_name VARCHAR(100) NOT NULL,
+ internal_name VARCHAR(100) NOT NULL,
Datatype VARCHAR(50),
- ordinal_position INTEGER NOT NULL,
- is_primary_key BOOLEAN NOT NULL,
- is_unique BOOLEAN NOT NULL,
- auto_generated BOOLEAN DEFAULT false,
- is_null_allowed BOOLEAN NOT NULL,
+ ordinal_position INTEGER NOT NULL,
+ is_primary_key BOOLEAN NOT NULL,
+ is_unique BOOLEAN NOT NULL,
+ auto_generated BOOLEAN DEFAULT false,
+ is_null_allowed BOOLEAN NOT NULL,
foreign_key VARCHAR(255),
reference_table VARCHAR(255),
- created_by bigint NOT NULL,
+ created_by bigint NOT NULL,
check_expression character varying(255),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
- FOREIGN KEY (cDBID, tID) REFERENCES mdb_TABLES (tDBID, ID),
- FOREIGN KEY (created_by) REFERENCES mdb_USERS (UserID),
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ FOREIGN KEY (cDBID, tID) REFERENCES mdb_tables (tDBID, ID),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
PRIMARY KEY (cDBID, tID, ID)
);
CREATE TABLE IF NOT EXISTS mdb_COLUMNS_ENUMS
(
- ID bigint NOT NULL DEFAULT nextval('mdb_columns_enum_seq'),
- eDBID bigint NOT NULL,
- tID bigint NOT NULL,
- cID bigint NOT NULL,
- enum_values CHARACTER VARYING(255) NOT NULL,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
+ ID bigint NOT NULL DEFAULT nextval(mdb_columns_enum_seq),
+ eDBID bigint NOT NULL,
+ tID bigint NOT NULL,
+ cID bigint NOT NULL,
+ enum_values CHARACTER VARYING(255) NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
FOREIGN KEY (eDBID, tID, cID) REFERENCES mdb_COLUMNS (cDBID, tID, ID),
PRIMARY KEY (ID, eDBID, tID, cID)
);
@@ -386,8 +365,8 @@ CREATE TABLE IF NOT EXISTS mdb_COLUMNS_nom
tID bigint,
cID bigint,
maxlength INTEGER,
- last_modified timestamp without time zone,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
FOREIGN KEY (cDBID, tID, cID) REFERENCES mdb_COLUMNS (cDBID, tID, ID),
PRIMARY KEY (cDBID, tID, cID)
);
@@ -403,9 +382,9 @@ CREATE TABLE IF NOT EXISTS mdb_COLUMNS_num
Mean NUMERIC,
Median NUMERIC,
Sd Numeric,
- Histogram INTEGER[],
- last_modified timestamp without time zone,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+-- Histogram INTEGER[],
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
FOREIGN KEY (cDBID, tID, cID) REFERENCES mdb_COLUMNS (cDBID, tID, ID),
PRIMARY KEY (cDBID, tID, cID)
);
@@ -416,9 +395,9 @@ CREATE TABLE IF NOT EXISTS mdb_COLUMNS_cat
tID bigint,
cID bigint,
num_cat INTEGER,
- cat_array TEXT[],
- last_modified timestamp without time zone,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+-- cat_array TEXT[],
+ last_modified timestamp,
+ created timestamp NOT NULL DEFAULT NOW(),
FOREIGN KEY (cDBID, tID, cID) REFERENCES mdb_COLUMNS (cDBID, tID, ID),
PRIMARY KEY (cDBID, tID, cID)
);
@@ -427,60 +406,60 @@ CREATE TABLE IF NOT EXISTS mdb_concepts
(
URI TEXT,
name TEXT,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ created timestamp NOT NULL DEFAULT NOW(),
created_by bigint,
- FOREIGN KEY (created_by) REFERENCES mdb_USERS (UserID),
+ FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
PRIMARY KEY (URI)
);
CREATE TABLE IF NOT EXISTS mdb_columns_concepts
(
- cDBID bigint NOT NULL,
- tID bigint NOT NULL,
- cID bigint NOT NULL,
+ cDBID bigint NOT NULL,
+ tID bigint NOT NULL,
+ cID bigint NOT NULL,
URI TEXT REFERENCES mdb_concepts (URI),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ created timestamp NOT NULL DEFAULT NOW(),
FOREIGN KEY (cDBID, tID, cID) REFERENCES mdb_COLUMNS (cDBID, tID, ID),
PRIMARY KEY (cDBID, tID, cID)
);
CREATE TABLE IF NOT EXISTS mdb_VIEW
(
- id bigint NOT NULL DEFAULT nextval('mdb_view_seq'),
- vcid bigint NOT NULL,
- vdbid bigint NOT NULL,
- vName VARCHAR(255) NOT NULL,
- internal_name VARCHAR(255) NOT NULL,
- Query TEXT NOT NULL,
- Public BOOLEAN NOT NULL,
+ id bigint NOT NULL DEFAULT nextval(mdb_view_seq),
+ vcid bigint NOT NULL,
+ vdbid bigint NOT NULL,
+ vName VARCHAR(255) NOT NULL,
+ internal_name VARCHAR(255) NOT NULL,
+ Query TEXT NOT NULL,
+ Public BOOLEAN NOT NULL,
NumCols INTEGER,
NumRows INTEGER,
- InitialView BOOLEAN NOT NULL,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- last_modified timestamp without time zone,
- deleted timestamp without time zone,
- created_by bigint NOT NULL,
- FOREIGN KEY (created_by) REFERENCES mdb_USERS (UserID),
+ InitialView BOOLEAN NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ last_modified timestamp,
+ deleted timestamp,
+ created_by bigint NOT NULL,
+ FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
FOREIGN KEY (vdbid) REFERENCES mdb_databases (id),
PRIMARY KEY (vdbid, id)
);
CREATE TABLE IF NOT EXISTS mdb_identifiers
(
- id bigint DEFAULT nextval('mdb_identifiers_seq'),
- cid bigint NOT NULL,
- dbid bigint NOT NULL,
+ id bigint DEFAULT nextval(mdb_identifiers_seq),
+ cid bigint NOT NULL,
+ dbid bigint NOT NULL,
qid bigint,
- title VARCHAR(255) NOT NULL,
- publisher VARCHAR(255) NOT NULL,
+ title VARCHAR(255) NOT NULL,
+ publisher VARCHAR(255) NOT NULL,
language VARCHAR(50),
license VARCHAR(50),
description TEXT,
- visibility VARCHAR(10) NOT NULL DEFAULT 'SELF',
- publication_year INTEGER NOT NULL,
+ visibility ENUM ('SELF', 'TRUSTED', 'EVERYONE') NOT NULL,
+ publication_year INTEGER NOT NULL,
publication_month INTEGER,
publication_day INTEGER,
- identifier_type varchar(50) NOT NULL,
+ identifier_type varchar(50) NOT NULL,
query TEXT,
query_normalized TEXT,
query_hash VARCHAR(255),
@@ -488,10 +467,10 @@ CREATE TABLE IF NOT EXISTS mdb_identifiers
result_hash VARCHAR(255),
result_number bigint,
doi VARCHAR(255),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- created_by bigint NOT NULL,
- last_modified timestamp without time zone,
- deleted timestamp without time zone,
+ created timestamp NOT NULL DEFAULT NOW(),
+ created_by bigint NOT NULL,
+ last_modified timestamp,
+ deleted timestamp,
PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
FOREIGN KEY (cid) REFERENCES mdb_containers (id),
FOREIGN KEY (dbid) REFERENCES mdb_databases (id),
@@ -501,15 +480,15 @@ CREATE TABLE IF NOT EXISTS mdb_identifiers
CREATE TABLE IF NOT EXISTS mdb_related_identifiers
(
- id bigint DEFAULT nextval('mdb_related_identifiers_seq'),
- iid bigint NOT NULL,
- value text NOT NULL,
+ id bigint DEFAULT nextval(mdb_related_identifiers_seq),
+ iid bigint NOT NULL,
+ value text NOT NULL,
type varchar(255),
relation varchar(255),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- created_by bigint NOT NULL,
- last_modified timestamp without time zone,
- deleted timestamp without time zone,
+ created timestamp NOT NULL DEFAULT NOW(),
+ created_by bigint NOT NULL,
+ last_modified timestamp,
+ deleted timestamp,
PRIMARY KEY (id, iid), /* must be a single id from persistent identifier concept */
FOREIGN KEY (iid) REFERENCES mdb_identifiers (id),
FOREIGN KEY (created_by) REFERENCES mdb_users (UserID)
@@ -517,14 +496,14 @@ CREATE TABLE IF NOT EXISTS mdb_related_identifiers
CREATE TABLE IF NOT EXISTS mdb_creators
(
- id bigint DEFAULT nextval('mdb_creators_seq'),
- pid bigint NOT NULL,
- name VARCHAR(255) NOT NULL,
+ id bigint DEFAULT nextval(mdb_creators_seq),
+ pid bigint NOT NULL,
+ name VARCHAR(255) NOT NULL,
affiliation VARCHAR(255),
orcid VARCHAR(255),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- created_by bigint NOT NULL,
- last_modified timestamp without time zone NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
+ created_by bigint NOT NULL,
+ last_modified timestamp NOT NULL,
FOREIGN KEY (created_by) REFERENCES mdb_users (UserID),
PRIMARY KEY (id, pid),
FOREIGN KEY (pid) REFERENCES mdb_identifiers (id)
@@ -533,8 +512,8 @@ CREATE TABLE IF NOT EXISTS mdb_creators
CREATE TABLE IF NOT EXISTS mdb_views_databases
(
mdb_view_id bigint,
- databases_id bigint REFERENCES mdb_DATABASES (id),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ databases_id bigint REFERENCES mdb_databases (id),
+ created timestamp NOT NULL DEFAULT NOW(),
FOREIGN KEY (mdb_view_id, databases_id) REFERENCES mdb_VIEW (id, vdbid),
PRIMARY KEY (mdb_view_id, databases_id)
);
@@ -543,45 +522,45 @@ CREATE TABLE IF NOT EXISTS mdb_feed
(
fDBID bigint,
fID bigint,
- fUserId INTEGER REFERENCES mdb_USERS (UserID),
- fDataID INTEGER REFERENCES mdb_DATA (ID),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
- FOREIGN KEY (fDBID, fID) REFERENCES mdb_TABLES (tDBID, ID),
+ fUserId INTEGER REFERENCES mdb_users (UserID),
+ fDataID INTEGER REFERENCES mdb_data (ID),
+ created timestamp NOT NULL DEFAULT NOW(),
+ FOREIGN KEY (fDBID, fID) REFERENCES mdb_tables (tDBID, ID),
PRIMARY KEY (fDBID, fID, fUserId, fDataID)
);
CREATE TABLE IF NOT EXISTS mdb_update
(
- uUserID INTEGER REFERENCES mdb_USERS (UserID),
- uDBID bigint REFERENCES mdb_DATABASES (id),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ uUserID INTEGER REFERENCES mdb_users (UserID),
+ uDBID bigint REFERENCES mdb_databases (id),
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (uUserID, uDBID)
);
CREATE TABLE IF NOT EXISTS mdb_access
(
- aUserID INTEGER REFERENCES mdb_USERS (UserID),
- aDBID bigint REFERENCES mdb_DATABASES (id),
+ aUserID INTEGER REFERENCES mdb_users (UserID),
+ aDBID bigint REFERENCES mdb_databases (id),
attime TIMESTAMP,
download BOOLEAN,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (aUserID, aDBID)
);
CREATE TABLE IF NOT EXISTS mdb_have_access
(
- hUserID bigint REFERENCES mdb_USERS (UserID),
- hDBID bigint REFERENCES mdb_DATABASES (id),
- hType accesstype,
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ hUserID bigint REFERENCES mdb_users (UserID),
+ hDBID bigint REFERENCES mdb_databases (id),
+ hType ENUM('R', 'W'),
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (hUserID, hDBID)
);
CREATE TABLE IF NOT EXISTS mdb_owns
(
- oUserID INTEGER REFERENCES mdb_USERS (UserID),
- oDBID bigint REFERENCES mdb_DATABASES (ID),
- created timestamp without time zone NOT NULL DEFAULT NOW(),
+ oUserID INTEGER REFERENCES mdb_users (UserID),
+ oDBID bigint REFERENCES mdb_databases (ID),
+ created timestamp NOT NULL DEFAULT NOW(),
PRIMARY KEY (oUserID, oDBID)
);
@@ -589,9 +568,6 @@ COMMIT;
BEGIN;
-INSERT INTO mdb_users (username, Main_Email, password)
-VALUES ('system', 'noreply@dbrepo.ossdip.at', (SELECT md5(random()::text)));
-
INSERT INTO mdb_licenses (identifier, uri)
VALUES ('MIT', 'https://opensource.org/licenses/MIT'),
('GPL-3.0-only', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html'),
@@ -604,7 +580,7 @@ VALUES ('MIT', 'https://opensource.org/licenses/MIT'),
INSERT INTO mdb_images (repository, tag, default_port, dialect, driver_class, jdbc_method)
VALUES ('mariadb', '10.5', 3306, 'org.hibernate.dialect.MariaDBDialect', 'org.mariadb.jdbc.Driver', 'mariadb');
-INSERT INTO mdb_images_environment_item (key, value, etype, iid)
+INSERT INTO mdb_images_environment_item (`key`, value, etype, iid)
VALUES ('ROOT', 'root', 'PRIVILEGED_USERNAME', 1),
('MARIADB_ROOT_PASSWORD', 'mariadb', 'PRIVILEGED_PASSWORD', 1),
('MARIADB_USER', 'mariadb', 'USERNAME', 1),
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
index 3ec8cd50702086f9a6a51986ce76a806826d60b1..0d2d4dbbda2ff9d2fa7d00123c5e06d647b7188a 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://fda-metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-metadata-service/rest-service/src/main/resources/application-local.yml b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
index e652090c7d5caa12821438f422204a789c47e6df..7278d3669413eaab1626315e32128c257aa7b4b1 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-metadata-service/rest-service/src/main/resources/application.yml b/fda-metadata-service/rest-service/src/main/resources/application.yml
index 307ead383f2ca7976501407f29fb6a6ee6efdee4..e10395d64fc18741d0d25038d41bd476ec735312 100644
--- a/fda-metadata-service/rest-service/src/main/resources/application.yml
+++ b/fda-metadata-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-query-service/rest-service/src/main/resources/application-docker.yml b/fda-query-service/rest-service/src/main/resources/application-docker.yml
index 933074053eb3c0244e53045264c5d54f01e3077a..19b6beb523a7650969cf5758852a66d8e9f2f83c 100644
--- a/fda-query-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-query-service/rest-service/src/main/resources/application-local.yml b/fda-query-service/rest-service/src/main/resources/application-local.yml
index 6708486f5e07fa88d89e5eba2c058f2247673bc0..4e107cf208ad0f4ab51f34daa9e47e22cd595208 100644
--- a/fda-query-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-query-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-query-service/rest-service/src/main/resources/application.yml b/fda-query-service/rest-service/src/main/resources/application.yml
index 4139a27347632709ba0a630e4c3151e0505e2af9..ee1656dd6b5c3e94eec2c9701372f29817eced34 100644
--- a/fda-query-service/rest-service/src/main/resources/application.yml
+++ b/fda-query-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa:
diff --git a/fda-table-service/rest-service/src/main/resources/application-docker.yml b/fda-table-service/rest-service/src/main/resources/application-docker.yml
index b5a642f22e584e17d14f1306ac3940c3a939526e..32321dd3c3e5e084552997bf42b2722bd5a44ca7 100644
--- a/fda-table-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-docker.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://fda-metadata-db:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: "${METADATA_USERNAME}"
+ password: "${METADATA_PASSWORD}"
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-table-service/rest-service/src/main/resources/application-local.yml b/fda-table-service/rest-service/src/main/resources/application-local.yml
index 15ecb64b47e1b0a5a701b43da40e6f79ff9f2ca4..3901f17037ca78736d16567c35fc400402ace4a7 100644
--- a/fda-table-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-table-service/rest-service/src/main/resources/application-local.yml
@@ -2,10 +2,10 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: jdbc:postgresql://localhost:5432/fda
- driver-class-name: org.postgresql.Driver
- username: postgres
- password: postgres
+ url: jdbc:mariadb://metadata-db:3306/fda
+ driver-class-name: org.mariadb.jdbc.Driver
+ username: dbrepo
+ password: dbrepo
jpa:
show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect
diff --git a/fda-table-service/rest-service/src/main/resources/application.yml b/fda-table-service/rest-service/src/main/resources/application.yml
index 1762a0569020c40d5548703b5f54a08615bbab9d..2f82391ccc9a19e5dff9044dffa1f8b0f8aa7d6f 100644
--- a/fda-table-service/rest-service/src/main/resources/application.yml
+++ b/fda-table-service/rest-service/src/main/resources/application.yml
@@ -2,8 +2,8 @@ app.version: '@project.version@'
spring:
main.banner-mode: off
datasource:
- url: "jdbc:postgresql://metadata-db:5432/${METADATA_DB}"
- driver-class-name: org.postgresql.Driver
+ url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
jpa: