Fixed various table and column names to adhere to Oracle restrinctions.

NO update for Postgres provided, because module has been not released yet. 
(Micro) version elevated nevertheless.
(Backport of fedorahosted:2862)


git-svn-id: https://svn.libreccm.org/ccm/trunk@3012 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2014-12-07 10:57:32 +00:00
parent 53f30aea0a
commit 1b5095f65a
4 changed files with 67 additions and 9 deletions

View File

@ -2,7 +2,7 @@
<ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project"
name="ccm-cms-types-decisiontree" name="ccm-cms-types-decisiontree"
prettyName="Red Hat CCM Content Types" prettyName="Red Hat CCM Content Types"
version="6.6.0" version="6.6.1"
release="1" release="1"
webapp="ROOT"> webapp="ROOT">
<ccm:dependencies> <ccm:dependencies>

View File

@ -53,11 +53,11 @@ association {
object type DecisionTreeSectionOption extends ContentItem { object type DecisionTreeSectionOption extends ContentItem {
Integer[1..1] rank = ct_decisiontree_section_options.rank; Integer[1..1] rank = ct_decisiontree_section_opts.rank;
String[1..1] label = ct_decisiontree_section_options.label; String[1..1] label = ct_decisiontree_section_opts.label;
String[1..1] value = ct_decisiontree_section_options.value; 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 // Association between a section and its options
composite DecisionTreeSection[1..1] treeSection = 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; to ct_decisiontree_sections.section_id;
component DecisionTreeSectionOption[0..n] sectionOptions = component DecisionTreeSectionOption[0..n] sectionOptions =
join ct_decisiontree_sections.section_id 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 = composite DecisionTreeSectionOption[1..1] matchOption =
join ct_decisiontree_option_targets.match_option 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 = 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; to ct_decisiontree_option_targets.match_option;
} }

View File

@ -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.

View File

@ -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;