diff --git a/ccm-cms-types-decisiontree/application.xml b/ccm-cms-types-decisiontree/application.xml index 006c2b84d..a4fba1679 100644 --- a/ccm-cms-types-decisiontree/application.xml +++ b/ccm-cms-types-decisiontree/application.xml @@ -2,7 +2,7 @@ diff --git a/ccm-cms-types-decisiontree/pdl/com/arsdigita/cms/contenttypes/DecisionTree.pdl b/ccm-cms-types-decisiontree/pdl/com/arsdigita/cms/contenttypes/DecisionTree.pdl index 61f9a0b6e..fba467686 100644 --- a/ccm-cms-types-decisiontree/pdl/com/arsdigita/cms/contenttypes/DecisionTree.pdl +++ b/ccm-cms-types-decisiontree/pdl/com/arsdigita/cms/contenttypes/DecisionTree.pdl @@ -53,11 +53,11 @@ association { object type DecisionTreeSectionOption extends ContentItem { - Integer[1..1] rank = ct_decisiontree_section_options.rank; - String[1..1] label = ct_decisiontree_section_options.label; - String[1..1] value = ct_decisiontree_section_options.value; + Integer[1..1] rank = ct_decisiontree_section_opts.rank; + String[1..1] label = ct_decisiontree_section_opts.label; + String[1..1] value = ct_decisiontree_section_opts.value; - reference key (ct_decisiontree_section_options.option_id); + reference key (ct_decisiontree_section_opts.option_id); } @@ -65,11 +65,11 @@ association { // Association between a section and its options composite DecisionTreeSection[1..1] treeSection = - join ct_decisiontree_section_options.section_id + join ct_decisiontree_section_opts.section_id to ct_decisiontree_sections.section_id; component DecisionTreeSectionOption[0..n] sectionOptions = join ct_decisiontree_sections.section_id - to ct_decisiontree_section_options.section_id; + to ct_decisiontree_section_opts.section_id; } @@ -89,9 +89,9 @@ association { composite DecisionTreeSectionOption[1..1] matchOption = join ct_decisiontree_option_targets.match_option - to ct_decisiontree_section_options.option_id; + to ct_decisiontree_section_opts.option_id; component DecisionTreeOptionTarget[0..1] optionTarget = - join ct_decisiontree_section_options.option_id + join ct_decisiontree_section_opts.option_id to ct_decisiontree_option_targets.match_option; } diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/oracle-se-6.6.0-6.6.1.sql new file mode 100644 index 000000000..1bea5577c --- /dev/null +++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -0,0 +1,23 @@ +-- +-- Copyright (C) 2014 Peter Boy. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id: oracle-se-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $ + +PROMPT Red Hat Enterprise types-decisiontree 6.6.0 -> 6.6.1 Upgrade Script (Oracle) + +-- This update fixes some naming problems with are incompatible to Oracle. +-- Therefore nothing to do for Oracle. diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/postgres-6.6.0-6.6.1.sql new file mode 100644 index 000000000..3e4536df0 --- /dev/null +++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/postgres-6.6.0-6.6.1.sql @@ -0,0 +1,35 @@ +-- +-- Copyright (C) 2014 Peter Boy. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $DateTime: 2013/04/07 23:15:09 $ + +\echo Red Hat Enterprise types-decisiontree 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) + +-- This update fixes some naming problems with are incompatible to Oracle. +-- Specifically +-- * ct_decisiontree_section_options.option_id +-- --> ct_decisiontree_section_opts.option_id +-- * ct_decisiontree_section_options.option_id +-- --> ct_decisiontree_section_opts.option_id +-- Actually no update script is provided because no installation should use +-- this content type yet, all changes are prerelease. + +-- begin; + +-- \i postgres/6.6.0-6.6.1/upd_decisiontree_tables.sql + +-- commit;