From 716506584330e81a7c6c5df914409fd581986eb1 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 15 Nov 2018 18:14:50 +0000 Subject: [PATCH] Fixed wrong naming for migration scripts git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5735 8810af33-2d31-482b-a856-94f89814c4df Former-commit-id: 2a4dd27507c6b5f3149f8cc60b82e608bb190f4c --- .../org/librecms/contentsection/ContentItem.java | 5 +++-- .../org/librecms/contentsection/ContentType.java | 3 ++- .../java/org/libreccm/security/Permission.java | 15 ++++++++++++++- ...d.sql => V7_0_0_34__add_resourcetype_uuid.sql} | 0 .../h2/V7_0_0_38__add_task_dependency_uuid.sql | 12 ++++++++++++ ...d.sql => V7_0_0_34__add_resourcetype_uuid.sql} | 0 .../pgsql/V7_0_0_37__add_task_assignment_uuid.sql | 11 +++++++++++ .../pgsql/V7_0_0_38__add_task_dependency_uuid.sql | 12 ++++++++++++ 8 files changed, 54 insertions(+), 4 deletions(-) rename ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/{V7_0_0_34_add_resourcetype_uuid.sql => V7_0_0_34__add_resourcetype_uuid.sql} (100%) create mode 100644 ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_38__add_task_dependency_uuid.sql rename ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/{V7_0_0_34_add_resourcetype_uuid.sql => V7_0_0_34__add_resourcetype_uuid.sql} (100%) create mode 100644 ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__add_task_assignment_uuid.sql create mode 100644 ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__add_task_dependency_uuid.sql diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java index 1c87a186a..cbcd51bf0 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java @@ -18,6 +18,8 @@ */ package org.librecms.contentsection; +import static org.librecms.CmsConstants.*; + import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.search.annotations.Field; @@ -58,7 +60,6 @@ import org.librecms.contentsection.privileges.ItemPrivileges; import javax.persistence.OrderBy; -import static org.librecms.CmsConstants.*; /** * Base type for all content item types. Specifies some common properties. @@ -835,7 +836,7 @@ public class ContentItem extends CcmObject implements Serializable { if (attachments == null) { this.attachments = new ArrayList<>(); } else { - this.attachments = attachments; + this.attachments = new ArrayList<>(attachments); } } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java index 91b75be09..4fc72c0e3 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentType.java @@ -18,10 +18,11 @@ */ package org.librecms.contentsection; +import static org.libreccm.core.CoreConstants.*; + import org.hibernate.annotations.NamedQueries; import org.hibernate.annotations.NamedQuery; -import static org.librecms.CmsConstants.*; import org.libreccm.core.CcmObject; import org.libreccm.l10n.LocalizedString; diff --git a/ccm-core/src/main/java/org/libreccm/security/Permission.java b/ccm-core/src/main/java/org/libreccm/security/Permission.java index 63c9bd042..6d2b8991b 100644 --- a/ccm-core/src/main/java/org/libreccm/security/Permission.java +++ b/ccm-core/src/main/java/org/libreccm/security/Permission.java @@ -25,7 +25,6 @@ import org.hibernate.search.annotations.Field; import org.hibernate.search.annotations.IndexedEmbedded; import org.libreccm.core.CcmObject; -import javax.persistence.*; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -41,6 +40,20 @@ import static org.libreccm.core.CoreConstants.DB_SCHEMA; import com.fasterxml.jackson.annotation.ObjectIdGenerators; import org.libreccm.imexport.Exportable; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.OneToOne; +import javax.persistence.Table; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + /** * A permission grants a privilege on an object or system wide to {@link Role}. * diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34_add_resourcetype_uuid.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid.sql similarity index 100% rename from ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34_add_resourcetype_uuid.sql rename to ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid.sql diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_38__add_task_dependency_uuid.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_38__add_task_dependency_uuid.sql new file mode 100644 index 000000000..7d71aa244 --- /dev/null +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_38__add_task_dependency_uuid.sql @@ -0,0 +1,12 @@ +alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add column UUID varchar(255) not null; + +alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add constraint UK_787va2ep8ucoul29qgsoaxnub unique (UUID); + + + + + + + diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34_add_resourcetype_uuid.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid.sql similarity index 100% rename from ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34_add_resourcetype_uuid.sql rename to ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid.sql diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__add_task_assignment_uuid.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__add_task_assignment_uuid.sql new file mode 100644 index 000000000..2507a4cff --- /dev/null +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_37__add_task_assignment_uuid.sql @@ -0,0 +1,11 @@ +alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS + add column UUID varchar(255) not null; + +alter table CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS + add constraint UK_gv93k167pe9qy3go9vjau1q2t unique (UUID); + + + + + + diff --git a/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__add_task_dependency_uuid.sql b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__add_task_dependency_uuid.sql new file mode 100644 index 000000000..7d71aa244 --- /dev/null +++ b/ccm-core/src/main/resources/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_38__add_task_dependency_uuid.sql @@ -0,0 +1,12 @@ +alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add column UUID varchar(255) not null; + +alter table CCM_CORE.WORKFLOW_TASK_DEPENDENCIES + add constraint UK_787va2ep8ucoul29qgsoaxnub unique (UUID); + + + + + + +