Further progress

d6d05b5b · Martin Weise · c34a7337 · d6d05b5b · d6d05b5b · d6d05b5b
Unverified Commit d6d05b5b authored 2 years ago by Martin Weise
--- a/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-docker.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-authentication-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application-local.yml
@@ -4,16 +4,17 @@ spring:
  datasource:
    url: jdbc:mariadb://localhost:3306/fda
    driver-class-name: org.mariadb.jdbc.Driver
-    username: dbrepo
+    username: root
    password: dbrepo
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-authentication-service/rest-service/src/main/resources/application.yml
+++ b/fda-authentication-service/rest-service/src/main/resources/application.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: "${METADATA_DB}"
        jdbc:
          time_zone: UTC
  application:

--- a/fda-container-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-docker.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-container-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-container-service/rest-service/src/main/resources/application-local.yml
@@ -8,12 +8,13 @@ spring:
    password: dbrepo
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-container-service/rest-service/src/main/resources/application.yml
+++ b/fda-container-service/rest-service/src/main/resources/application.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: "${METADATA_DB}"
        jdbc:
          time_zone: UTC
  application:

--- a/fda-database-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-docker.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-database-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-database-service/rest-service/src/main/resources/application-local.yml
@@ -8,12 +8,13 @@ spring:
    password: dbrepo
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-database-service/rest-service/src/main/resources/application.yml
+++ b/fda-database-service/rest-service/src/main/resources/application.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: "${METADATA_DB}"
        jdbc:
          time_zone: UTC
  application:

--- a/fda-discovery-service/discovery/src/main/resources/application-docker.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application-docker.yml
@@ -7,7 +7,7 @@ spring:
    password: postgres
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false

--- a/fda-discovery-service/discovery/src/main/resources/application.yml
+++ b/fda-discovery-service/discovery/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false

--- a/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-docker.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-identifier-service/rest-service/src/main/resources/application-local.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application-local.yml
@@ -8,12 +8,13 @@ spring:
    password: dbrepo
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: fda
        jdbc:
          time_zone: UTC
  application:

--- a/fda-identifier-service/rest-service/src/main/resources/application.yml
+++ b/fda-identifier-service/rest-service/src/main/resources/application.yml
@@ -8,12 +8,13 @@ spring:
    password: "${METADATA_PASSWORD}"
  jpa:
    show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
+    database-platform: org.hibernate.dialect.MariaDBDialect
    hibernate:
      ddl-auto: validate
    open-in-view: false
    properties:
      hibernate:
+        default_schema: "${METADATA_DB}"
        jdbc:
          time_zone: UTC
  application:

--- a/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
+++ b/fda-identifier-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java
@@ -98,7 +98,7 @@ public abstract class BaseUnitTest {
    public final static String IMAGE_1_TAG = "13-alpine";
    public final static String IMAGE_1_HASH = "83b40f2726e5";
    public final static Integer IMAGE_1_PORT = 5432;
-    public final static String IMAGE_1_DIALECT = "org.hibernate.dialect.PostgreSQLDialect";
+    public final static String IMAGE_1_DIALECT = "org.mariadb.jdbc.Driver";
    public final static String IMAGE_1_DRIVER = "org.postgresql.Driver";
    public final static String IMAGE_1_JDBC = "postgresql";
    public final static Long IMAGE_1_SIZE = 12000L;

--- a/fda-metadata-db/Dockerfile
+++ b/fda-metadata-db/Dockerfile
@@ -31,7 +31,7 @@ ENV MARIADB_PASSWORD="${METADATA_PASSWORD}"
 # Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
 HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent

-COPY ./setup-schema.sql /docker-entrypoint-initdb.d/1.sql
-COPY ./setup-user.sh /docker-entrypoint-initdb.d/2.sh
+COPY ./setup-user.sh /docker-entrypoint-initdb.d/1.sh
+COPY ./setup-schema.sql /docker-entrypoint-initdb.d/2.sql

 COPY --from=build /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
\ No newline at end of file
--- a/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java
+++ b/fda-metadata-db/api/src/main/java/at/tuwien/api/database/table/columns/concepts/ConceptDto.java
@@ -16,6 +16,9 @@ import java.time.Instant;
 @NoArgsConstructor
 public class ConceptDto {

+    @NotNull
+    private String id;
+
    @NotNull
    private String uri;


--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -65,7 +65,7 @@ public class Database {
    @Column(nullable = false)
    private String exchange;

-    @Column
+    @Column(columnDefinition = "TEXT")
    private String description;

    @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)

--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/License.java
@@ -21,7 +21,7 @@ public class License {
    @Column(nullable = false)
    private String identifier;

-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "TEXT")
    private String uri;

 }
\ No newline at end of file
--- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java
+++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java
@@ -62,7 +62,7 @@ public class View {
    @Column(name = "initialview", nullable = false)
    private Boolean isInitialView;

-    @Column(nullable = false)
+    @Column(nullable = false, columnDefinition = "TEXT")
    private String query;

    @Column(nullable = false, updatable = false)