From f7c13c00c612eb17fa9c46c7baf85c2ce686dcb0 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 9 Dec 2014 16:11:04 +0000 Subject: [PATCH] Modified upgrade ccm-cms-6.6.6-6.6.7. The definition of the column is_default which is added to the table section_workflow_template_map by this upgrade differs between PostgreSQL and Oracle (see generated DDL files). Created distict SQL files for PostgreSQL and Oracle which are creating the table with same definitions as in the generated DDL files. git-svn-id: https://svn.libreccm.org/ccm/trunk@3019 8810af33-2d31-482b-a856-94f89814c4df --- .../6.6.6-6.6.7/add_default_workflow.sql | 25 +++++++++++++++++++ .../6.6.6-6.6.7/add_default_workflow.sql | 5 ++-- .../ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql | 2 +- .../ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.6-6.6.7/add_default_workflow.sql rename ccm-cms/sql/ccm-cms/{default => postgres}/upgrade/6.6.6-6.6.7/add_default_workflow.sql (82%) diff --git a/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.6-6.6.7/add_default_workflow.sql b/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.6-6.6.7/add_default_workflow.sql new file mode 100644 index 000000000..30d111b63 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.6-6.6.7/add_default_workflow.sql @@ -0,0 +1,25 @@ +-- +-- Copyright (C) 2012 Jens Pelzetter. 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 +-- +-- Adds the is_default column to the section_workflow_template_map table +-- + +ALTER TABLE section_workflow_template_map +ADD COLUMN is_default CHAR(1) not null; +ALTER TABLE section_workflow_template_map +ADD CONSTRAINT sect_wor_tem_map_is_de_c_0mfli check(is_default in ('0', '1')); +UPDATE section_workflow_template_map SET is_default = '0'; \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/add_default_workflow.sql b/ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.6-6.6.7/add_default_workflow.sql similarity index 82% rename from ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/add_default_workflow.sql rename to ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.6-6.6.7/add_default_workflow.sql index f28e1ab55..a54abbf6e 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.6-6.6.7/add_default_workflow.sql +++ b/ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.6-6.6.7/add_default_workflow.sql @@ -18,5 +18,6 @@ -- Adds the is_default column to the section_workflow_template_map table -- -ALTER TABLE section_workflow_template_map ADD COLUMN is_default character varying(1) DEFAULT '0'::character varying NOT NULL; --- UPDATE section_workflow_template_map SET is_default = 'false'; \ No newline at end of file +ALTER TABLE section_workflow_template_map +ADD COLUMN is_default BOOLEAN NOT NULL; +UPDATE section_workflow_template_map SET is_default = 'false'; \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql index 110ab7814..0343b91be 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.6-6.6.7.sql @@ -23,4 +23,4 @@ PROMPT Red Hat Enterprise CMS 6.6.6 -> 6.6.7 Upgrade Script (Oracle) @@ ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql @@ ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql -@@ ../default/upgrade/6.6.6-6.6.7/add_default_workflow.sql \ No newline at end of file +@@ ../oracle-se/upgrade/6.6.6-6.6.7/add_default_workflow.sql \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql index 363786b0b..931a5d5d5 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.6-6.6.7.sql @@ -26,6 +26,6 @@ begin; \i ../default/upgrade/6.6.6-6.6.7/remove_workspace_legacy_entries.sql \i ../default/upgrade/6.6.6-6.6.7/remove_service_legacy_entries.sql -\i ../default/upgrade/6.6.6-6.6.7/add_default_workflow.sql +\i ../postgres/upgrade/6.6.6-6.6.7/add_default_workflow.sql commit;