From a44f30fef80c05c9dde2b150b01d332b0d8b99f8 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 12 Dec 2014 10:53:59 +0000 Subject: [PATCH] Fixed another compatibility problem with Oracle in ccm-cms-6.6.0-6.6.1. Oracle does not support the bytea type, instead a Blob is used in Oracle. git-svn-id: https://svn.libreccm.org/ccm/trunk@3038 8810af33-2d31-482b-a856-94f89814c4df --- .../upd_table_cms_related_links.sql | 3 ++- .../6.6.0-6.6.1/upd_table_cms_publ_links.sql | 18 ++++++++++++++++++ .../6.6.0-6.6.1/upd_table_cms_publ_links.sql | 0 .../ccm-cms/upgrade/oracle-se-6.6.0-6.6.1.sql | 2 +- .../ccm-cms/upgrade/postgres-6.6.0-6.6.1.sql | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql rename ccm-cms/sql/ccm-cms/{default => postgres}/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql (100%) diff --git a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql index bcd2bef41..fe55f82ec 100644 --- a/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql +++ b/ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql @@ -15,7 +15,8 @@ -- -- $Id: upd_table_cms_related_links.sql $ -ALTER TABLE cms_related_link ADD link_list_name VARCHAR(100) +-- Column is created by ccm-cms-6.6.0-6.6.1 +-- ALTER TABLE cms_related_link ADD link_list_name VARCHAR(100) UPDATE cms_related_links SET link_list_name = 'NONE' diff --git a/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql b/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql new file mode 100644 index 000000000..734ca29e8 --- /dev/null +++ b/ccm-cms/sql/ccm-cms/oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql @@ -0,0 +1,18 @@ +-- +-- 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: upd_table_cms_publ_links.sql pboy $ + +alter table cms_published_links add link_attributes BLOB; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql b/ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql similarity index 100% rename from ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql rename to ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.0-6.6.1.sql index e529b1afc..0c9368419 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -24,7 +24,7 @@ PROMPT Red Hat Enterprise CMS 6.6.0 -> 6.6.1 Upgrade Script (Oracle) @@ ../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 -@@ ../default/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql +@@ ../oracle-se/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql @@ ../default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql @@ ../default/upgrade/6.6.0-6.6.1/upd_table_content_types.sql @@ ../default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql diff --git a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.0-6.6.1.sql index 105cb4039..f13a21036 100644 --- a/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.0-6.6.1.sql @@ -26,7 +26,7 @@ begin; \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 ../default/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.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/upd_table_cms_rel_links.sql \i ../default/upgrade/6.6.0-6.6.1/upd_table_content_types.sql \i ../default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql