Fixed several upgrade scripts to make them compatible with Oracle. Oracle does not understand ALTER TABLE ADD COLUMN, for PostgreSQL the "COLUMN" is optional. Therefore we removed the "COLUMN" from all these statements.

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

ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.1-6.6.2/cms_item_image_attachment.sql

@@ -18,4 +18,4 @@
 -- $Id: upd_acs_objects.sql  $
 
 
-alter table cms_item_image_attachment add column sort_key integer;
+alter table cms_item_image_attachment add sort_key integer;

ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.1-6.6.2/add_info_fields.sql

@@ -22,13 +22,13 @@
 -- fedorahosted!
 
 ALTER TABLE ct_public_personal_profiles
-    ADD COLUMN position VARCHAR(2048);
+    ADD position VARCHAR(2048);
 
 ALTER TABLE ct_public_personal_profiles
-    ADD COLUMN interests text;
+    ADD interests text;
 
 ALTER TABLE ct_public_personal_profiles 
-    ADD COLUMN misc text;
+    ADD misc text;
 
 ALTER TABLE ct_public_personal_profiles
     DROP COLUMN show_publication_list;

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

@@ -15,30 +15,6 @@
 --
 -- $Id: upd_table_cms_articles .sql pboy $
 
--- alter table cms_articles add column text_id integer ;
--- update cms_articles set text_id = (select text_id from cms_text_pages
---                     where cms_text_pages.item_id = cms_articles.article_id);
-
--- alter table cms_articles  drop constraint cms_article_article_id_f_ekqk1 ;
-
--- alter table cms_articles  add  constraint cms_article_article_id_f_ekqk1
---                                FOREIGN KEY (article_id)
---                                REFERENCES cms_pages (item_id);
--- alter table cms_articles  add  constraint cms_articles_text_id_f_8ah18
---                                FOREIGN KEY (text_id)
---                                REFERENCES cms_text (text_id);
-
--- alter table ct_events drop constraint ct_events_item_id_f_v7kjv ;
-
--- drop table  cms_text_pages;
-
--- ALTER TABLE ct_events
---     ADD CONSTRAINT ct_events_item_id_f_v7kjv FOREIGN KEY (item_id)
---     REFERENCES cms_articles(article_id);
--- Error msg bei zes-testupd:
--- FEHLER:  Einfügen oder Aktualisieren in Tabelle »ct_events« verletzt Fremdschlüssel-Constraint »ct_events_item_id_f_v7kjv«
--- DETAIL:  Schlüssel (item_id)=(520355) ist nicht in Tabelle »cms_articles« vorhanden.
-
 -- deletes constraints in all tables with references on cms_articles!
 drop table cms_articles  CASCADE ;
 

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

@@ -15,5 +15,4 @@
 --
 -- $Id: upd_table_cms_publ_links.sql pboy $
 
-alter table cms_published_links
+alter table cms_published_links add link_attributes bytea;
-    add column link_attributes bytea;

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

@@ -15,5 +15,4 @@
 --
 -- $Id: upd_table_cms_tel_links.sql pboy $
 
-alter table cms_related_links
+alter table cms_related_links add link_list_name varchar(100);
-    add column link_list_name varchar(100);

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

@@ -19,8 +19,8 @@ alter table content_types
    drop constraint content_types_is_internal_ck ;
 
 alter table content_types
-    add column ancestors character varying(2000),
+    add ancestors character varying(2000),
-    add column descendants character varying(2000) ;
+    add descendants character varying(2000) ;
 
 
 update content_types

ccm-cms/sql/ccm-cms/default/upgrade/6.6.10-6.6.11/add_cms_publish_lock_stacktrace_column.sql

@@ -20,4 +20,4 @@
 -- adds to stacktrace column to the cms_publish_lock table, allowing easier analysis of problems
 -- with the publication process
 
-ALTER TABLE cms_publish_lock ADD COLUMN stacktrace TEXT;
+ALTER TABLE cms_publish_lock ADD stacktrace TEXT;

ccm-cms/sql/ccm-cms/default/upgrade/6.6.2-6.6.3/upd_table_persons.sql

@@ -22,7 +22,7 @@
 -- fedorahosted!
 
 ALTER TABLE cms_persons 
-    ADD COLUMN alias_id INTEGER REFERENCES cms_persons;
+    ADD alias_id INTEGER REFERENCES cms_persons;
 
 ALTER TABLE cms_persons 
-    ADD COLUMN dabin_id INTEGER;
+    ADD dabin_id INTEGER;

ccm-cms/sql/ccm-cms/default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql

@@ -19,4 +19,4 @@
 
 -- adds to personsstr column (used for filtering organization by their members)
 
-ALTER TABLE cms_orgaunits ADD COLUMN personsstr TEXT;
+ALTER TABLE cms_orgaunits ADD personsstr TEXT;

ccm-core/sql/ccm-core/upgrade/default/6.6.5-6.6.6/add_cat_visible.sql

@@ -17,5 +17,7 @@
 --
 -- $Id$
 
-ALTER TABLE cat_categories ADD COLUMN visible_p CHAR(1);
+ALTER TABLE cat_categories 
+        ADD visible_p CHAR(1);
+
 UPDATE cat_categories SET visible_p = 1;

ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.0-6.6.1/move-reviewed.sql

@@ -1,5 +1,5 @@
 -- Add column for reviewed property to ct_publications table
-alter table ct_publications add column reviewed boolean;
+alter table ct_publications add reviewed boolean;
 
 -- Copy existing values for reviewed from
 -- * ct_article_in_collected_volume

ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-authors-field.sql

@@ -1,5 +1,5 @@
 -- Add column for authors property in ct_publications table
-alter table ct_publications add column authors varchar(2048);
+alter table ct_publications add authors varchar(2048);
 
 -- Fill the authors property for existing publications
 update ct_publications set authors = (array_to_string(array(select cms_persons.surname || ', ' || cms_persons.givenname 

ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-internet-articles-properties.sql

@@ -1,4 +1,4 @@
 -- Add columns
-alter table ct_internet_article add column url varchar(2048);
+alter table ct_internet_article add url varchar(2048);
-alter table ct_internet_article add column urn varchar(2048);
+alter table ct_internet_article add urn varchar(2048);
-alter table ct_internet_article add column doi varchar(2048);
+alter table ct_internet_article add doi varchar(2048);

ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-journal-symbol.sql

@@ -1,2 +1,2 @@
 -- Add journal symbol column
-ALTER TABLE ct_journal ADD COLUMN symbol VARCHAR(128);
+ALTER TABLE ct_journal ADD symbol VARCHAR(128);

ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-publication-fields.sql

@@ -1,3 +1,3 @@
 -- Add fields for year of first publication and language of the publication
-ALTER TABLE ct_publications ADD COLUMN firstPublished INTEGER;
+ALTER TABLE ct_publications ADD firstPublished INTEGER;
-ALTER TABLE ct_publications ADD COLUMN lang VARCHAR(128);
+ALTER TABLE ct_publications ADD lang VARCHAR(128);

ccm-sci-types-project/sql/ccm-sci-types-project/default/upgrade/6.6.7-6.6.8/add_sponsor_fundingcode.sql

@@ -1,2 +1,2 @@
 ALTER TABLE ct_sci_project_sponsor_map 
- ADD COLUMN sponsor_funding_code VARCHAR(512);
+        ADD sponsor_funding_code VARCHAR(512);