From 2bfa0f34a895dd77b3001296b8f331d226a90865 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 22 Nov 2021 12:14:12 +0200 Subject: [PATCH 1/3] liquibase update --- .../entity/annotations/ManualResizeRedactionEntity.java | 2 +- .../main/resources/db/changelog/1-initial-schema.changelog.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java index 9a099c02a..a9df5a343 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java @@ -50,7 +50,7 @@ public class ManualResizeRedactionEntity { @ManyToOne private FileEntity fileStatus; - @ElementCollection + @ElementCollection` private List positions = new ArrayList<>(); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml index 4672228ec..5b55fd6f2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/db/changelog/1-initial-schema.changelog.yaml @@ -607,7 +607,7 @@ databaseChangeLog: type: VARCHAR(255) - column: name: value - type: VARCHAR(255) + type: VARCHAR(4000) - column: name: file_status_id type: VARCHAR(255) From ebfdda24c1372298149efdb6b482d51015de3341 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 22 Nov 2021 12:16:53 +0200 Subject: [PATCH 2/3] liquibase update --- .../entity/annotations/ManualResizeRedactionEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java index a9df5a343..9a099c02a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/annotations/ManualResizeRedactionEntity.java @@ -50,7 +50,7 @@ public class ManualResizeRedactionEntity { @ManyToOne private FileEntity fileStatus; - @ElementCollection` + @ElementCollection private List positions = new ArrayList<>(); } From 57b8e9034a23fc5229881f7f43d2f05b894c9520 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Mon, 22 Nov 2021 12:24:17 +0200 Subject: [PATCH 3/3] liquibase for tests. dug --- .../src/main/resources/application-dev.yml | 4 ++-- .../src/main/resources/application.yml | 3 +-- .../src/test/resources/application.yml | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml index b25e08288..b557f08d8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml @@ -13,6 +13,7 @@ storage: key: minioadmin secret: minioadmin +spring: datasource: url: jdbc:postgresql://localhost:5432/redaction driverClassName: org.postgresql.Driver @@ -22,6 +23,5 @@ storage: jpa: database-platform: org.hibernate.dialect.PostgreSQL95Dialect hibernate: - ddl-auto: update + ddl-auto: none naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy - generate-ddl: true diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml index 7cb2c2a4a..5570b2b13 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application.yml @@ -20,9 +20,8 @@ spring: jpa: database-platform: org.hibernate.dialect.PostgreSQL95Dialect hibernate: + ddl-auto: none naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy - generate-ddl: false - generate-ddl: false profiles: active: kubernetes diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml b/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml index 980811b00..1cc050cb8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/test/resources/application.yml @@ -6,9 +6,9 @@ spring: jpa: database-platform: org.hibernate.dialect.PostgreSQL95Dialect hibernate: - ddl-auto: update + ddl-auto: none naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy - generate-ddl: true + generate-ddl: false rabbitmq: