From a89ac0edb081710473693489f88bd8553eafc0e5 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 17 Dec 2014 08:37:47 +0000 Subject: [PATCH] Alternative upgrade for ccm-cms-6.6.0-6.6.1 if ccm-cms-assets-imagestep is not installed git-svn-id: https://svn.libreccm.org/ccm/trunk@3061 8810af33-2d31-482b-a856-94f89814c4df --- .../ccm-cms/upgrade/oracle-se-6.5.9-6.6.0.sql | 31 ++++++++++++++++ .../ccm-cms/upgrade/oracle-se-6.5.9-6.6.1.sql | 32 ++++++++++++++++ .../ccm-cms/upgrade/postgre-6.5.9-6.6.0.sql | 35 ++++++++++++++++++ .../ccm-cms/upgrade/postgre-6.5.9-6.6.1.sql | 37 +++++++++++++++++++ ccm-cms/src/ccm-cms.upgrade | 25 +++++++++++++ 5 files changed, 160 insertions(+) create mode 100644 ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.0.sql create mode 100644 ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.1.sql create mode 100644 ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.0.sql create mode 100644 ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.1.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.0.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.0.sql new file mode 100644 index 000000000..825db2112 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.0.sql @@ -0,0 +1,31 @@ +-- +-- Copyright (C) 2014 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 +-- + +-- This is part 1 of an alternative upgrade path for the upgrade 6.6.0-6.6.1. The upgrade +-- 6.6.0-6.6.1 requires that ccm-cms-assets-imagestep is installed. But cmc-cms-assets-imagestep +-- can't be installed before 6.6.0-6.6.1 because 6.6.0-6.6.1 alters some important tables used +-- when calling ccm load. This upgrade and the upgrade 6.5.9-6.6.1 split the 6.6.0-6.6.1 upgrade +-- into two parts. This part, 6.5.9-6.6.0 is altering the tables needed by ccm load. After this +-- upgrade you can install ccm-cms-assets-imagestep using ccm load ccm-cms-assets-imagestep. +-- The upgrade ccm-cms-6.5.9-6.6.1 contains the remaining parts of the 6.6.0-6.6.1 upgrade +-- especially the part which requires ccm-cms-assets-imagestep. + +PROMPT Red Hat Enterprise CMS 6.5.9 -> 6.6.0 Upgrade Script (Oracle) + +@@ ../default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql +@@ ../oracle-se/upgrade/6.6.0-6.6.1/upd_table_content_types.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.1.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.1.sql new file mode 100644 index 000000000..4c2c73419 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.5.9-6.6.1.sql @@ -0,0 +1,32 @@ +-- +-- Copyright (C) 2014 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 +-- + +-- This is part 2 of the split upgrade 6.6.0-6.6.1. See the explanation in 6.5.9-6.6.0 + +PROMPT Red Hat Enterprise CMS 6.5.9 -> 6.6.1 Upgrade Script (Oracle) + +@@ ../default/upgrade/6.6.0-6.6.1/add_table_cms_addresses.sql +@@ ../default/upgrade/6.6.0-6.6.1/add_tables_cms_contacts.sql +@@ ../default/upgrade/6.6.0-6.6.1/add_tables_cms_persons.sql +@@ ../default/upgrade/6.6.0-6.6.1/add_tables_cms_organisation.sql +@@ ../default/upgrade/6.6.0-6.6.1/add_table_cms_rel_attr.sql +@@ ../oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql +@@ ../default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql +@@ ../oracle-se/upgrade/6.6.0-6.6.1/drop_old_cms_articles.sql +@@ ../default/upgrade/6.6.0-6.6.1/upd_table_cms_articles.sql +@@ ../default/upgrade/6.6.0-6.6.1/upd_table_authoring_steps.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.0.sql b/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.0.sql new file mode 100644 index 000000000..a1c95c42f --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.0.sql @@ -0,0 +1,35 @@ +-- +-- Copyright (C) 2014 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 +-- + +-- This is part 1 of an alternative upgrade path for the upgrade 6.6.0-6.6.1. The upgrade +-- 6.6.0-6.6.1 requires that ccm-cms-assets-imagestep is installed. But cmc-cms-assets-imagestep +-- can't be installed before 6.6.0-6.6.1 because 6.6.0-6.6.1 alters some important tables used +-- when calling ccm load. This upgrade and the upgrade 6.5.9-6.6.1 split the 6.6.0-6.6.1 upgrade +-- into two parts. This part, 6.5.9-6.6.0 is altering the tables needed by ccm load. After this +-- upgrade you can install ccm-cms-assets-imagestep using ccm load ccm-cms-assets-imagestep. +-- The upgrade ccm-cms-6.5.9-6.6.1 contains the remaining parts of the 6.6.0-6.6.1 upgrade +-- especially the part which requires ccm-cms-assets-imagestep. + +\echo Red Hat Enterprise CMS 6.5.9 -> 6.6.0 Upgrade Script (PostgreSQL) + +begin; + +\i ../postgres/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql +\i ../default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql + +commit; \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.1.sql b/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.1.sql new file mode 100644 index 000000000..6419f2489 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/upgrade/postgre-6.5.9-6.6.1.sql @@ -0,0 +1,37 @@ +-- +-- Copyright (C) 2014 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 +-- + +-- This is part 2 of the split upgrade 6.6.0-6.6.1. See the explanation in 6.5.9-6.6.0 + +\echo Red Hat Enterprise CMS 6.5.9 -> 6.6.1 Upgrade Script (PostgreSQL) + +begin; + +\i ../default/upgrade/6.6.0-6.6.1/add_table_cms_addresses.sql +\i ../default/upgrade/6.6.0-6.6.1/add_tables_cms_contacts.sql +\i ../default/upgrade/6.6.0-6.6.1/add_tables_cms_persons.sql +\i ../default/upgrade/6.6.0-6.6.1/add_tables_cms_organisation.sql +\i ../default/upgrade/6.6.0-6.6.1/add_table_cms_rel_attr.sql +\i ../postgres/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql +\i ../default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql +\i ../postgres/upgrade/6.6.0-6.6.1/drop_old_cms_articles.sql +\i ../default/upgrade/6.6.0-6.6.1/upd_table_cms_articles.sql +\i ../default/upgrade/6.6.0-6.6.1/upd_table_authoring_steps.sql + + +commit; \ No newline at end of file diff --git a/ccm-cms/src/ccm-cms.upgrade b/ccm-cms/src/ccm-cms.upgrade index 0b8aded58..4b2b12a94 100755 --- a/ccm-cms/src/ccm-cms.upgrade +++ b/ccm-cms/src/ccm-cms.upgrade @@ -35,7 +35,32 @@