From 910771e81f967882bcb9dde73db8707bf3212da8 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 23 Oct 2017 08:05:02 +0000 Subject: [PATCH] CCM NG: Database migrations for PageModel components provided by ccm-cms git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5073 8810af33-2d31-482b-a856-94f89814c4df --- .../pagemodel/CategorizedItemComponent.java | 2 +- .../pagemodel/FixedContentItemComponent.java | 2 +- .../librecms/pagemodel/ItemListComponent.java | 2 - ...7_0_0_17__create_page_model_components.sql | 80 +++++++++++++++++++ ...7_0_0_17__create_page_model_components.sql | 75 +++++++++++++++++ 5 files changed, 157 insertions(+), 4 deletions(-) create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql create mode 100644 ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java index 9017dfb3c..ce028dcfa 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/CategorizedItemComponent.java @@ -29,7 +29,7 @@ import static org.librecms.CmsConstants.*; * @author Jens Pelzetter */ @Entity -@Table(name = "CATEGORIZED_ITEM_COMPONENT", schema = DB_SCHEMA) +@Table(name = "CATEGORIZED_ITEM_COMPONENTS", schema = DB_SCHEMA) public class CategorizedItemComponent extends ContentItemComponent { private static final long serialVersionUID = 6366311513244770272L; diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java index ed7d30b6a..6be884401 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/FixedContentItemComponent.java @@ -34,7 +34,7 @@ import static org.librecms.CmsConstants.*; * @author Jens Pelzetter */ @Entity -@Table(name = "FIXED_CONTENT_ITEM_COMPONENT", schema = DB_SCHEMA) +@Table(name = "FIXED_CONTENT_ITEM_COMPONENTS", schema = DB_SCHEMA) public class FixedContentItemComponent extends ContentItemComponent { private static final long serialVersionUID = -4518031021801472455L; diff --git a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java index 6796800fc..7833ea8a5 100644 --- a/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java +++ b/ccm-cms/src/main/java/org/librecms/pagemodel/ItemListComponent.java @@ -23,10 +23,8 @@ import org.librecms.contentsection.ContentItem; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Objects; -import java.util.Set; import javax.persistence.CollectionTable; import javax.persistence.Column; diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql new file mode 100644 index 000000000..a7cdd116a --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/h2/V7_0_0_17__create_page_model_components.sql @@ -0,0 +1,80 @@ +create table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID bigint not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.CATEGORY_TREE_COMPONENTS ( + SHOW_FULL_TREE boolean, + COMPONENT_MODEL_ID bigint not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.CONTENT_ITEM_COMPONENTS ( + MODE varchar(255), + COMPONENT_MODEL_ID bigint not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID bigint not null, + CONTENT_ITEM_ID bigint, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.GREETING_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID bigint not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.ITEM_LIST_COMPONENTS ( + DESCINDING boolean, + LIMIT_TO_TYPE varchar(255), + PAGE_SIZE integer, + COMPONENT_MODEL_ID bigint not null, + primary key (COMPONENT_MODEL_ID) +); + +alter table CCM_CMS.CATEGORIZED_ITEM_COMPONENT + add constraint FKr9w6qafqrbi83nncn7f6ufas7 + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.CATEGORY_TREE_COMPONENTS + add constraint FKfhc51tkdf705o0sy8sndqpkqa + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.CONTENT_ITEM_COMPONENTS + add constraint FKp83o82kxo2ipa0xo03wxp4dcr + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.CONTENT_ITEM_COMPONENTS + add constraint FKp83o82kxo2ipa0xo03wxp4dcr + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS + add constraint FKlfv2clu7ubk18unio8fyvlbnf + foreign key (CONTENT_ITEM_ID) + references CCM_CMS.CONTENT_ITEMS; + +alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS + add constraint FKkpiuth8e994phxy1x1drh2wf5 + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.GREETING_ITEM_COMPONENTS + add constraint FK3fble8pmmolb7lmsca8akmb94 + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.ITEM_LIST_COMPONENTS + add constraint FKje8r8nvkqv8fj7i0eo1pew2yq + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.ITEM_LIST_ORDER + add constraint FKisnil2ibh98y2ws8or6guij21 + foreign key (ITEM_LIST_ID) + references CCM_CMS.ITEM_LIST_COMPONENTS; diff --git a/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql new file mode 100644 index 000000000..2d5a5dc15 --- /dev/null +++ b/ccm-cms/src/main/resources/db/migrations/org/librecms/ccm_cms/pgsql/V7_0_0_17__create_page_model_components.sql @@ -0,0 +1,75 @@ +create table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID int8 not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.CATEGORY_TREE_COMPONENTS ( + SHOW_FULL_TREE boolean, + COMPONENT_MODEL_ID int8 not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.CONTENT_ITEM_COMPONENTS ( + MODE varchar(255), + COMPONENT_MODEL_ID int8 not null, + primary key (COMPONENT_MODEL_ID) + ); + +create table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID int8 not null, + CONTENT_ITEM_ID int8, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.GREETING_ITEM_COMPONENTS ( + COMPONENT_MODEL_ID int8 not null, + primary key (COMPONENT_MODEL_ID) +); + +create table CCM_CMS.ITEM_LIST_COMPONENTS ( + DESCINDING boolean, + LIMIT_TO_TYPE varchar(255), + PAGE_SIZE int4, + COMPONENT_MODEL_ID int8 not null, + primary key (COMPONENT_MODEL_ID) +); + +alter table CCM_CMS.CATEGORIZED_ITEM_COMPONENTS + add constraint FKlraxqtl9cnntdo0qovq340y7b + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.CATEGORY_TREE_COMPONENTS + add constraint FKfhc51tkdf705o0sy8sndqpkqa + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.CONTENT_ITEM_COMPONENTS + add constraint FKp83o82kxo2ipa0xo03wxp4dcr + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS + add constraint FKlfv2clu7ubk18unio8fyvlbnf + foreign key (CONTENT_ITEM_ID) + references CCM_CMS.CONTENT_ITEMS; + +alter table CCM_CMS.FIXED_CONTENT_ITEM_COMPONENTS + add constraint FKkpiuth8e994phxy1x1drh2wf5 + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.GREETING_ITEM_COMPONENTS + add constraint FK3fble8pmmolb7lmsca8akmb94 + foreign key (COMPONENT_MODEL_ID) + references CCM_CMS.CONTENT_ITEM_COMPONENTS; + +alter table CCM_CMS.ITEM_LIST_COMPONENTS + add constraint FKje8r8nvkqv8fj7i0eo1pew2yq + foreign key (COMPONENT_MODEL_ID) + references CCM_CORE.PAGE_MODEL_COMPONENT_MODELS; + +alter table CCM_CMS.ITEM_LIST_ORDER + add constraint FKisnil2ibh98y2ws8or6guij21 + foreign key (ITEM_LIST_ID) + references CCM_CMS.ITEM_LIST_COMPONENTS;