From ff4c6811cac1a5baebdb85b2a55c443bb33eb342 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 13 Jun 2020 18:57:40 +0200 Subject: [PATCH] Bugfixes --- .../V7_0_0_24__add_lifecycle_uuid.java | 8 +++---- .../h2/V7_0_0_24__add_lifecycle_uuid.java | 22 +++++++++++++++++++ .../pgsql/V7_0_0_24__add_lifecycle_uuid.java | 22 +++++++++++++++++++ .../scripts/001_create_schema.sql | 5 ++--- .../main/java/org/libreccm/core/CcmCore.java | 1 - .../scripts/001_create_schema.sql | 2 +- .../scripts/create_ccm_docrepo_schema.sql | 4 ++-- .../scripts/create_ccm_shortcuts_schema.sql | 4 ++-- 8 files changed, 55 insertions(+), 13 deletions(-) rename ccm-cms/src/main/java/db/migrations/org/{libreccm => librecms}/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java (95%) create mode 100644 ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java create mode 100644 ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java diff --git a/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java similarity index 95% rename from ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java rename to ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java index fc0925ddb..bcb9026f3 100644 --- a/ccm-cms/src/main/java/db/migrations/org/libreccm/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/V7_0_0_24__add_lifecycle_uuid.java @@ -1,4 +1,4 @@ -package db.migrations.org.libreccm.ccm_cms; +package db.migrations.org.librecms.ccm_cms; import org.flywaydb.core.api.migration.BaseJavaMigration; import org.flywaydb.core.api.migration.Context; @@ -84,7 +84,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { private void addDefinitionLifecycleCol(final Connection connection) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "alter table LIFECYCLE_DEFINITIONS " + "alter table lifecyle_definitions " + "add column UUID varchar(255)" )) { stmt.execute(); @@ -110,7 +110,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { final Connection connection, final List definitionIds ) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "update LIFECYCLE_DEFINITIONS set UUID = ? " + "update LIFECYLE_DEFINITIONS set UUID = ? " + "where LIFECYCLE_DEFINITION_ID = ?" )) { for (final Long lifecycleId : definitionIds) { @@ -139,7 +139,7 @@ public class V7_0_0_24__add_lifecycle_uuid extends BaseJavaMigration { final Connection connection ) throws Exception { try (PreparedStatement stmt = connection.prepareStatement( - "alter table LIFECYCLE_DEFINITIONS " + "alter table LIFECYLE_DEFINITIONS " + "add constraint UK_n6ki3s5im2k2nccpocuctqqe3 " + "unique (UUID)" )) { diff --git a/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java new file mode 100644 index 000000000..0a5aed475 --- /dev/null +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_24__add_lifecycle_uuid.java @@ -0,0 +1,22 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package db.migrations.org.librecms.ccm_cms.h2; + +import org.flywaydb.core.api.migration.Context; + +/** + * + * @author Jens Pelzetter + */ +public class V7_0_0_24__add_lifecycle_uuid + extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid { + + @Override + public void migrate(final Context context) throws Exception { + super.migrate(context); + } + +} diff --git a/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java new file mode 100644 index 000000000..62b12dc3e --- /dev/null +++ b/ccm-cms/src/main/java/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_24__add_lifecycle_uuid.java @@ -0,0 +1,22 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package db.migrations.org.librecms.ccm_cms.pgsql; + +import org.flywaydb.core.api.migration.Context; + +/** + * + * @author Jens Pelzetter + */ +public class V7_0_0_24__add_lifecycle_uuid + extends db.migrations.org.librecms.ccm_cms.V7_0_0_24__add_lifecycle_uuid { + + @Override + public void migrate(final Context context) throws Exception { + super.migrate(context); + } + +} diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql index 8f5613b9e..7fd77d983 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -1,9 +1,8 @@ -drop schema if exists CCM_CMS; -drop schema if exists CCM_CORE; +drop schema if exists CCM_CMS CASCADE; +drop schema if exists CCM_CORE CASCADE; drop sequence if exists HIBERNATE_SEQUENCE; - create schema CCM_CMS; create schema CCM_CORE; diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java index 684047481..c74208d6b 100644 --- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java +++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java @@ -47,7 +47,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import javax.transaction.Transactional; /** diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql index 643d210ad..520144928 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -1,4 +1,4 @@ -drop schema if exists CCM_CORE; +drop schema if exists CCM_CORE CASCADE; drop sequence if exists HIBERNATE_SEQUENCE; diff --git a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql index 1e6174e67..7e6be987a 100644 --- a/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql +++ b/ccm-docrepo/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_docrepo_schema.sql @@ -1,5 +1,5 @@ -DROP SCHEMA IF EXISTS ccm_docrepo; -DROP SCHEMA IF EXISTS ccm_core; +DROP SCHEMA IF EXISTS ccm_docrepo CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; DROP SEQUENCE IF EXISTS hibernate_sequence; diff --git a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql index 8719e64a2..a783ef6fd 100644 --- a/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql +++ b/ccm-shortcuts/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_shortcuts_schema.sql @@ -1,5 +1,5 @@ -DROP SCHEMA IF EXISTS ccm_shortcuts; -DROP SCHEMA IF EXISTS ccm_core; +DROP SCHEMA IF EXISTS ccm_shortcuts CASCADE; +DROP SCHEMA IF EXISTS ccm_core CASCADE; DROP SEQUENCE IF EXISTS hibernate_sequence;