Skip to content
Snippets Groups Projects
Unverified Commit d6d05b5b authored by Martin Weise's avatar Martin Weise
Browse files

Further progress

parent c34a7337
No related branches found
No related tags found
4 merge requests!129New module for citation as they occur multiple,!121Modified logging, modified logging level, modified flasgger endpoint,!113Resolve "Bugs related with Query Service",!109Resolve "Use MariaDB for metadata database"
Showing
with 36 additions and 21 deletions
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -4,16 +4,17 @@ spring: ...@@ -4,16 +4,17 @@ spring:
datasource: datasource:
url: jdbc:mariadb://localhost:3306/fda url: jdbc:mariadb://localhost:3306/fda
driver-class-name: org.mariadb.jdbc.Driver driver-class-name: org.mariadb.jdbc.Driver
username: dbrepo username: root
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: "${METADATA_DB}"
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: "${METADATA_DB}"
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: "${METADATA_DB}"
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
password: postgres password: postgres
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
......
...@@ -7,7 +7,7 @@ spring: ...@@ -7,7 +7,7 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: dbrepo password: dbrepo
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: fda
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -8,12 +8,13 @@ spring: ...@@ -8,12 +8,13 @@ spring:
password: "${METADATA_PASSWORD}" password: "${METADATA_PASSWORD}"
jpa: jpa:
show-sql: false show-sql: false
database-platform: org.hibernate.dialect.PostgreSQLDialect database-platform: org.hibernate.dialect.MariaDBDialect
hibernate: hibernate:
ddl-auto: validate ddl-auto: validate
open-in-view: false open-in-view: false
properties: properties:
hibernate: hibernate:
default_schema: "${METADATA_DB}"
jdbc: jdbc:
time_zone: UTC time_zone: UTC
application: application:
......
...@@ -98,7 +98,7 @@ public abstract class BaseUnitTest { ...@@ -98,7 +98,7 @@ public abstract class BaseUnitTest {
public final static String IMAGE_1_TAG = "13-alpine"; public final static String IMAGE_1_TAG = "13-alpine";
public final static String IMAGE_1_HASH = "83b40f2726e5"; public final static String IMAGE_1_HASH = "83b40f2726e5";
public final static Integer IMAGE_1_PORT = 5432; 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_DRIVER = "org.postgresql.Driver";
public final static String IMAGE_1_JDBC = "postgresql"; public final static String IMAGE_1_JDBC = "postgresql";
public final static Long IMAGE_1_SIZE = 12000L; public final static Long IMAGE_1_SIZE = 12000L;
......
...@@ -31,7 +31,7 @@ ENV MARIADB_PASSWORD="${METADATA_PASSWORD}" ...@@ -31,7 +31,7 @@ ENV MARIADB_PASSWORD="${METADATA_PASSWORD}"
# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service # 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 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/1.sh
COPY ./setup-user.sh /docker-entrypoint-initdb.d/2.sh COPY ./setup-schema.sql /docker-entrypoint-initdb.d/2.sql
COPY --from=build /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien COPY --from=build /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
\ No newline at end of file
...@@ -16,6 +16,9 @@ import java.time.Instant; ...@@ -16,6 +16,9 @@ import java.time.Instant;
@NoArgsConstructor @NoArgsConstructor
public class ConceptDto { public class ConceptDto {
@NotNull
private String id;
@NotNull @NotNull
private String uri; private String uri;
......
...@@ -65,7 +65,7 @@ public class Database { ...@@ -65,7 +65,7 @@ public class Database {
@Column(nullable = false) @Column(nullable = false)
private String exchange; private String exchange;
@Column @Column(columnDefinition = "TEXT")
private String description; private String description;
@ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
......
...@@ -21,7 +21,7 @@ public class License { ...@@ -21,7 +21,7 @@ public class License {
@Column(nullable = false) @Column(nullable = false)
private String identifier; private String identifier;
@Column(nullable = false) @Column(nullable = false, columnDefinition = "TEXT")
private String uri; private String uri;
} }
\ No newline at end of file
...@@ -62,7 +62,7 @@ public class View { ...@@ -62,7 +62,7 @@ public class View {
@Column(name = "initialview", nullable = false) @Column(name = "initialview", nullable = false)
private Boolean isInitialView; private Boolean isInitialView;
@Column(nullable = false) @Column(nullable = false, columnDefinition = "TEXT")
private String query; private String query;
@Column(nullable = false, updatable = false) @Column(nullable = false, updatable = false)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment