From f55df351b51c8de475d9204eafa8852884d17c4f Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 10 Dec 2014 10:12:12 +0000 Subject: [PATCH] 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 --- .../6.6.1-6.6.2/cms_item_image_attachment.sql | 2 +- .../upgrade/6.6.1-6.6.2/add_info_fields.sql | 6 ++--- .../6.6.0-6.6.1/upd_table_cms_articles.sql | 24 ------------------- .../6.6.0-6.6.1/upd_table_cms_publ_links.sql | 3 +-- .../6.6.0-6.6.1/upd_table_cms_rel_links.sql | 3 +-- .../6.6.0-6.6.1/upd_table_content_types.sql | 4 ++-- ...add_cms_publish_lock_stacktrace_column.sql | 2 +- .../upgrade/6.6.2-6.6.3/upd_table_persons.sql | 4 ++-- .../6.6.7-6.6.8/add_personsstr_column.sql | 2 +- .../default/6.6.5-6.6.6/add_cat_visible.sql | 4 +++- .../upgrade/6.6.0-6.6.1/move-reviewed.sql | 2 +- .../upgrade/6.6.1-6.6.2/add-authors-field.sql | 2 +- .../add-internet-articles-properties.sql | 6 ++--- .../6.6.3-6.6.4/add-journal-symbol.sql | 2 +- .../6.6.3-6.6.4/add-publication-fields.sql | 4 ++-- .../6.6.7-6.6.8/add_sponsor_fundingcode.sql | 2 +- 16 files changed, 24 insertions(+), 48 deletions(-) diff --git a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.1-6.6.2/cms_item_image_attachment.sql b/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.1-6.6.2/cms_item_image_attachment.sql index 745e56e09..14792e41b 100644 --- a/ccm-cms-assets-imagestep/sql/ccm-cms-assets-imagestep/default/upgrade/6.6.1-6.6.2/cms_item_image_attachment.sql +++ b/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; \ No newline at end of file +alter table cms_item_image_attachment add sort_key integer; \ No newline at end of file diff --git a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.1-6.6.2/add_info_fields.sql b/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.1-6.6.2/add_info_fields.sql index 8010dfa54..13d8ee4f7 100644 --- a/ccm-cms-publicpersonalprofile/sql/ccm-cms-publicpersonalprofile/default/upgrade/6.6.1-6.6.2/add_info_fields.sql +++ b/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; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_articles.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_articles.sql index fc976a395..ab82e6693 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_articles.sql +++ b/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 ; 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/default/upgrade/6.6.0-6.6.1/upd_table_cms_publ_links.sql index d97c13368..64efa3a03 100644 --- 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/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 - add column link_attributes bytea; +alter table cms_published_links add link_attributes bytea; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql index 4a9d39c3f..50d7a6891 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_cms_rel_links.sql +++ b/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 - add column link_list_name varchar(100); +alter table cms_related_links add link_list_name varchar(100); diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_content_types.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_content_types.sql index 9240a7150..ff407a579 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/upd_table_content_types.sql +++ b/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 column descendants character varying(2000) ; + add ancestors character varying(2000), + add descendants character varying(2000) ; update content_types diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.10-6.6.11/add_cms_publish_lock_stacktrace_column.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.10-6.6.11/add_cms_publish_lock_stacktrace_column.sql index cfea5730c..53ba66173 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.10-6.6.11/add_cms_publish_lock_stacktrace_column.sql +++ b/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; \ No newline at end of file +ALTER TABLE cms_publish_lock ADD stacktrace TEXT; \ No newline at end of file diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.2-6.6.3/upd_table_persons.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.2-6.6.3/upd_table_persons.sql index c3af3c349..78d0916f6 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.2-6.6.3/upd_table_persons.sql +++ b/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; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql index 923faa814..fb2b1f18c 100644 --- a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.7-6.6.8/add_personsstr_column.sql +++ b/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; \ No newline at end of file +ALTER TABLE cms_orgaunits ADD personsstr TEXT; \ No newline at end of file diff --git a/ccm-core/sql/ccm-core/upgrade/default/6.6.5-6.6.6/add_cat_visible.sql b/ccm-core/sql/ccm-core/upgrade/default/6.6.5-6.6.6/add_cat_visible.sql index 3c52b9df1..ecae0fc92 100644 --- a/ccm-core/sql/ccm-core/upgrade/default/6.6.5-6.6.6/add_cat_visible.sql +++ b/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; diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.0-6.6.1/move-reviewed.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.0-6.6.1/move-reviewed.sql index 741f008e7..225b16315 100644 --- a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.0-6.6.1/move-reviewed.sql +++ b/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 diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-authors-field.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-authors-field.sql index b9f00c0b1..a2e9502ae 100644 --- a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-authors-field.sql +++ b/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 diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-internet-articles-properties.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-internet-articles-properties.sql index 218a9c8f2..dcb21c711 100644 --- a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.1-6.6.2/add-internet-articles-properties.sql +++ b/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 column urn varchar(2048); -alter table ct_internet_article add column doi varchar(2048); \ No newline at end of file +alter table ct_internet_article add url varchar(2048); +alter table ct_internet_article add urn varchar(2048); +alter table ct_internet_article add doi varchar(2048); \ No newline at end of file diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-journal-symbol.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-journal-symbol.sql index 1596e2685..8361ac0a6 100644 --- a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-journal-symbol.sql +++ b/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); diff --git a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-publication-fields.sql b/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-publication-fields.sql index d21c61bb5..77e8ddab1 100644 --- a/ccm-sci-publications/sql/ccm-sci-publications/default/upgrade/6.6.3-6.6.4/add-publication-fields.sql +++ b/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 COLUMN lang VARCHAR(128); \ No newline at end of file +ALTER TABLE ct_publications ADD firstPublished INTEGER; +ALTER TABLE ct_publications ADD lang VARCHAR(128); \ No newline at end of file diff --git a/ccm-sci-types-project/sql/ccm-sci-types-project/default/upgrade/6.6.7-6.6.8/add_sponsor_fundingcode.sql b/ccm-sci-types-project/sql/ccm-sci-types-project/default/upgrade/6.6.7-6.6.8/add_sponsor_fundingcode.sql index 9b3c59d1b..39c6baf13 100644 --- a/ccm-sci-types-project/sql/ccm-sci-types-project/default/upgrade/6.6.7-6.6.8/add_sponsor_fundingcode.sql +++ b/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); \ No newline at end of file + ADD sponsor_funding_code VARCHAR(512); \ No newline at end of file