Fixed various potiential, Oracle related problems in upgrade scripts.

git-svn-id: https://svn.libreccm.org/ccm/trunk@3037 8810af33-2d31-482b-a856-94f89814c4df

ccm-cms-assets-relatedlink/sql/ccm-cms-assets-relatedlink/upgrade/default/6.6.0-6.6.1/upd_table_cms_related_links.sql

@@ -15,6 +15,8 @@
 --
 -- $Id: upd_table_cms_related_links.sql  $
 
+ALTER TABLE cms_related_link ADD link_list_name VARCHAR(100)
+
 UPDATE cms_related_links
       SET link_list_name = 'NONE'
       WHERE link_list_name IS NULL;

ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/add_table_cms_addresses.sql

@@ -20,7 +20,7 @@ create table cms_addresses (
     address character varying(1000),
     postalcode character varying(20),
     city character varying(200),
-    state character varying(200),
+    "state" character varying(200),
     isocountrycode character varying(2)
 );
 

ccm-cms/sql/ccm-cms/default/upgrade/6.6.3-6.6.4/create_publish_lock.sql

@@ -1,13 +0,0 @@
-CREATE TABLE cms_publish_lock (
-    lock_id integer NOT NULL,    	    	    
-    locked_oid character varying(2048),    	    
-    lock_timestamp timestamp with time zone,    		    		  
-    action character varying(256)    	    	  
-);
-
-ALTER TABLE cms_publish_lock      	     	   
-    ADD CONSTRAINT cms_publis_loc_lock_id_p_8n7d0 PRIMARY KEY (lock_id);    	 	
--- ALTER TABLE public.cms_publish_lock OWNER TO ccm;
-
-   	 
-

ccm-cms/sql/ccm-cms/postgres/upgrade/6.6.7-6.6.8/set_singleton.sql

@@ -0,0 +1,21 @@
+--
+-- Copyright (C) 2013 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
+--
+-- $Id$
+
+UPDATE application_types SET singleton_p = '1' WHERE object_type = 'com.arsdigita.cms.ContentCenter';
+UPDATE application_types SET singleton_p = '1' WHERE object_type = 'com.arsdigita.cms.Service';

ccm-cms/sql/ccm-cms/upgrade/oracle-se-6.6.7-6.6.8.sql

@@ -22,4 +22,4 @@ PROMPT Red Hat Enterprise CMS 6.6.7 -> 6.6.8 Upgrade Script (Oracle)
 
 @@ ../default/upgrade/6.6.7-6.6.8/rename_workspace_to_contentcenter.sql
 @@ ../default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql
-@@ ../default/upgrade/6.6.7-6.6.8/set_singleton.sql
+@@ ../oracle-se/upgrade/6.6.7-6.6.8/set_singleton.sql

ccm-cms/sql/ccm-cms/upgrade/postgres-6.6.7-6.6.8.sql

@@ -25,6 +25,6 @@ begin;
 
 \i ../default/upgrade/6.6.7-6.6.8/rename_workspace_to_contentcenter.sql
 \i ../default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql
-\i ../default/upgrade/6.6.7-6.6.8/set_singleton.sql
+\i ../postgres/upgrade/6.6.7-6.6.8/set_singleton.sql
 
 commit;

ccm-core/sql/ccm-core/upgrade/oracle-se-6.6.4-6.6.5.sql

@@ -21,6 +21,21 @@ PROMPT Red Hat Enterprise CORE 6.6.4 -> 6.6.5 Upgrade Script (Oracle)
 
 -- 
 
+-- Remove old style application tables, must be the first script executed.
+@@ default/6.6.4-6.6.5/remove_old_style_app_tables.sql
+
+-- Adjust table cat_object_root_category_map 
+-- (Constraint cat_obj_package_id_fk already removed in step 1)
+@@ default/6.6.4-6.6.5/remove_old_app_entries_catobjectroot_table.sql
+
+-- Adjust table applications
+-- (Constraint apapplication_package_id_f_cdaho already removed in step 1)
+@@ default/6.6.4-6.6.5/remove_old_app_entries_applications_table.sql
+
+-- Adjust table application_types
+-- (Constraint applica_typ_pac_typ_id_f_v80ma already removed in step 1)
+@@ default/6.6.4-6.6.5/remove_old_app_entries_applicationtypes_table.sql
+
 -- Remove bebop entries in apm_package* which are not used anymore.
 --@@ default/6.6.3-6.6.4/remove_bebop_legacy_entries.sql
 

ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.6.0-6.6.1.sql

@@ -20,4 +20,4 @@
 PROMPT OpenCCM ccm-forum 6.6.0 -> 6.6.1 Upgrade Script (Oracle)
  
 
-@@ default/6.6.0-6.6.1/add_ispublic.sql
+@@ oracle-se/6.6.0-6.6.1/add_ispublic.sql

ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.6.0-6.6.1/add_ispublic.sql

@@ -0,0 +1,23 @@
+--
+-- 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: add_ispublic.sql pboy $
+
+ALTER TABLE forum_forums 
+ ADD COLUMN is_public CHAR(1) NOT NULL 
+ CONSTRAINT forum_forums_is_public_c_284tm check(is_public in ('0', '1'))
+
+
+

ccm-forum/sql/ccm-forum/upgrade/postgres-6.6.0-6.6.1.sql

@@ -21,7 +21,7 @@
  
 begin;
 
-\i default/6.6.0-6.6.1/add_ispublic.sql
+\i postgres/6.6.0-6.6.1/add_ispublic.sql
 
 commit;
 

ccm-navigation/sql/ccm-navigation/upgrade/oracle-se-6.6.1-6.6.2.sql

@@ -24,5 +24,3 @@
 
 
 @@ default/6.6.1-6.6.2/remove_legacy_entries.sql
---  @@ ../oracle-se/upgrade/6.6.0-6.6.1/upd_acs_objects.sql
---  @@ ../oracle-se/upgrade/6.6.0-6.6.1/upd_application_tables.sql

ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_acs_objects.sql

@@ -23,9 +23,8 @@
 
 
 update acs_objects
-    set (object_type,display_name,default_domain_class)  =
+   set object_type = 'com.arsdigita.navigation.portlet.NavigationTreePortlet',
-        ('com.arsdigita.navigation.portlet.NavigationTreePortlet',
+       display_name = 'Navigation Tree',
-         'Navigation Tree',
+       default_domain_class = 'com.arsdigita.navigation.portlet.NavigationTreePortlet'
-         'com.arsdigita.navigation.portlet.NavigationTreePortlet')
  where object_type
   like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;

ccm-navigation/sql/ccm-navigation/upgrade/oracle-se/6.6.0-6.6.1/upd_application_tables.sql

@@ -23,10 +23,9 @@
 
 
 update application_types
+   set object_type = 'com.arsdigita.navigation.portlet.NavigationTreePortlet',
+       title = 'Navigation Tree',
+       description = 'Displays a tree of navigation categories' 
     set (object_type,title,description) =
-            ('com.arsdigita.navigation.portlet.NavigationTreePortlet',
+  where object_type like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;
-             'Navigation Tree',
-             'Displays a tree of navigation categories' )
-    where object_type
-        like 'com.arsdigita.portalworkspace.portlet.NavigationDirectoryPortlet' ;
 

ccm-navigation/sql/ccm-navigation/upgrade/postgres-6.6.1-6.6.2.sql

@@ -23,7 +23,5 @@
 begin;
 
 \i default/6.6.1-6.6.2/remove_legacy_entries.sql
--- \i ../postgres/upgrade/6.6.0-6.6.1/upd_acs_objects.sql
--- \i ../postgres/upgrade/6.6.0-6.6.1/upd_application_tables.sql
 
 commit;