diff --git a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/oracle-se-6.6.0-6.6.1.sql index 8439edd58..501e58d34 100644 --- a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -19,4 +19,4 @@ PROMPT Red Hat Enterprise CT ARTICLE 6.6.0 -> 6.6.1 Upgrade Script (Oracle) -@@ ./default/6.6.0-6.6.1/upd_table_ct_articles.sql +@@ default/6.6.0-6.6.1/upd_table_ct_articles.sql diff --git a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/postgres-6.6.0-6.6.1.sql index e277c4ffa..dc8bcec89 100644 --- a/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-cms-types-article/sql/ccm-cms-types-article/upgrade/postgres-6.6.0-6.6.1.sql @@ -15,12 +15,12 @@ -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --- $DateTime: 2010/11/10 23:15:09 $ +-- $Id: postgres-6.6.0-6.6.1.sql pboy $ \echo Red Hat Enterprise CT ARTICLE 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) begin; -\i ./default/6.6.0-6.6.1/upd_table_ct_articles.sql +\i default/6.6.0-6.6.1/upd_table_ct_articles.sql commit; diff --git a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql index e8ab43a39..45eb9a45e 100644 --- a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql +++ b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/default/6.6.0-6.6.1/upd_table_ct_events.sql @@ -13,7 +13,7 @@ -- 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_ct_articles.sql pboy $ +-- $Id: upd_table_ct_events.sql pboy $ -- recreate constraint on cms_articles which had to be deleted during -- update of cms_articles diff --git a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/oracle-se-6.6.0-6.6.1.sql index c30c2e819..282853f56 100644 --- a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -19,4 +19,4 @@ PROMPT Red Hat Enterprise CT EVENT 6.6.0 -> 6.6.1 Upgrade Script (Oracle) -@@ ./default/6.6.0-6.6.1/upd_table_ct_events.sql +@@ default/6.6.0-6.6.1/upd_table_ct_events.sql diff --git a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/postgres-6.6.0-6.6.1.sql index a971ca0c5..176fbb04a 100644 --- a/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-cms-types-event/sql/ccm-cms-types-event/upgrade/postgres-6.6.0-6.6.1.sql @@ -21,6 +21,6 @@ begin; -\i ./default/6.6.0-6.6.1/upd_table_ct_events.sql +\i default/6.6.0-6.6.1/upd_table_ct_events.sql commit; diff --git a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql index 5c88c06fc..be118f656 100644 --- a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql +++ b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/default/6.6.0-6.6.1/upd_constraints.sql @@ -13,9 +13,9 @@ -- 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_ct_articles.sql pboy $ +-- $Id: upd_constraints.sql pboy $ --- recreate constraint on cms_articles which had to be deleted during +-- recreate constraint on ct_news which had to be deleted during -- update of cms_articles ALTER TABLE ct_news ADD CONSTRAINT ct_news_item_id_f_mduh5 FOREIGN KEY (item_id) diff --git a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/oracle-se-6.6.0-6.6.1.sql index 1622bbb11..47fccc72b 100644 --- a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -19,4 +19,4 @@ PROMPT Red Hat Enterprise CT NEWSITEM 6.6.0 -> 6.6.1 Upgrade Script (Oracle) -@@ ../default/upgrade/6.6.0-6.6.1/upd_constraints.sql +@@ default/6.6.0-6.6.1/upd_constraints.sql diff --git a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/postgres-6.6.0-6.6.1.sql index 7d354daf5..af13f5ec1 100644 --- a/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-cms-types-newsitem/sql/ccm-cms-types-newsitem/upgrade/postgres-6.6.0-6.6.1.sql @@ -15,12 +15,12 @@ -- License along with this library; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- --- $DateTime: 2010/11/10 23:15:09 $ +-- $Id: postgres-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $ \echo Red Hat Enterprise CT NEWSITEM 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) begin; -\i ./default/upgrade/6.6.0-6.6.1/upd_constraints.sql +\i default/6.6.0-6.6.1/upd_constraints.sql commit; diff --git a/ccm-cms/sql/ccm-cms/default/content-section/comment-content_types.sql b/ccm-cms/sql/ccm-cms/default/content-section/comment-content_types.sql index f23e2dbd0..fc65a6de5 100755 --- a/ccm-cms/sql/ccm-cms/default/content-section/comment-content_types.sql +++ b/ccm-cms/sql/ccm-cms/default/content-section/comment-content_types.sql @@ -30,16 +30,6 @@ comment on column content_types.classname is ' comment on column content_types.label is ' The pretty name for this content type '; ---comment on column content_types.is_internal is ' --- An internal content type is one that is not user-defined and maintained --- internally. A content type should be made internal under the following --- two conditions: --- 1) The object type needs to take advantage of content type services --- (i.e., versioning, categorization, lifecycle, workflow) that are already --- implemented in CMS. --- 2) The content type cannot be explicitly registered to a content section. --- The Template content type is one such internal content type. ---'; comment on column content_types.mode is ' Saves the mode of the content type: I = internal, H = hidden @@ -52,6 +42,6 @@ comment on column content_types.label is ' 2) The content type cannot be explicitly registered to a content section. The Template content type is one such internal content type. - A hidden content type is one that cannot used directly but other content + A hidden content type is one that cannot be used directly but other content types can extend from it. Also, it is a legit parent for UDCTs. '; diff --git a/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_table_cms_article_image_map.sql b/ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql similarity index 100% rename from ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_table_cms_article_image_map.sql rename to ccm-cms/sql/ccm-cms/default/upgrade/6.6.0-6.6.1/drop_table_cms_article_image_map.sql 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 adfb00589..fc976a395 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 @@ -13,9 +13,50 @@ -- 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_articles.sql pboy $ +-- $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 ; + +alter table cms_text_pages drop constraint cms_text_pages_item_id_f_kfox7 ; +alter table cms_text_pages drop constraint cms_text_pages_text_id_f_uri55 ; +alter table cms_text_pages drop constraint cms_text_pages_item_id_p_7tnky CASCADE ; +drop index cms_text_pages_text_id_idx ; + +alter table cms_text_pages rename to cms_articles ; +alter table cms_articles rename column item_id to article_id ; + +ALTER TABLE cms_articles ADD CONSTRAINT cms_article_article_id_p_s67nq + PRIMARY KEY (article_id); +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 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); -drop table cms_text_pages; \ No newline at end of file diff --git a/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/6.6.0-6.6.1/upd_constraints.sql b/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/6.6.0-6.6.1/upd_constraints.sql index 5c3d8f2c7..4efcad979 100644 --- a/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/6.6.0-6.6.1/upd_constraints.sql +++ b/ccm-ldn-terms/sql/ccm-ldn-terms/default/upgrade/6.6.0-6.6.1/upd_constraints.sql @@ -15,8 +15,8 @@ -- -- $Id: upd_constraints.sql pboy $ --- recreate constraint on cms_articles which had to be deleted during --- update of cms_articles +-- recreate constraint on trm_domains_indexer which got lost anywhere during +-- the update processes ALTER TABLE trm_domains_indexer ADD CONSTRAINT trm_doma_inde_index_id_f_ggaqm FOREIGN KEY (indexer_id) REFERENCES acs_objects(object_id); \ No newline at end of file diff --git a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-6.6.0-6.6.1.sql b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-6.6.0-6.6.1.sql index bd1346ee4..7d3c10cf9 100644 --- a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-6.6.0-6.6.1.sql +++ b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/oracle-se-6.6.0-6.6.1.sql @@ -17,6 +17,6 @@ -- -- $Id: oracle-se-6.6.0-6.6.1.sql 293 2011-01-07 15:10:39Z pboy $ -PROMPT Red Hat Enterprise CT NEWSITEM 6.6.0 -> 6.6.1 Upgrade Script (Oracle) +PROMPT Red Hat Enterprise TERMS 6.6.0 -> 6.6.1 Upgrade Script (Oracle) -@@ ./default/6.6.0-6.6.1/upd_constraints.sql +@@ ../default/upgrade/6.6.0-6.6.1/upd_constraints.sql diff --git a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql index ea4e12b36..6c9a88d1f 100644 --- a/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql +++ b/ccm-ldn-terms/sql/ccm-ldn-terms/upgrade/postgres-6.6.0-6.6.1.sql @@ -17,10 +17,10 @@ -- -- $DateTime: 2010/11/10 23:15:09 $ -\echo Red Hat Enterprise CT NEWSITEM 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) +\echo Red Hat Enterprise TERMS 6.6.0 -> 6.6.1 Upgrade Script (PostgreSQL) begin; -\i ./default/6.6.0-6.6.1/upd_constraints.sql +\i ../default/upgrade/6.6.0-6.6.1/upd_constraints.sql commit; diff --git a/ccm-ldn-terms/src/ccm-ldn-terms.upgrade b/ccm-ldn-terms/src/ccm-ldn-terms.upgrade index d1ae2cb44..1ae84ccb5 100755 --- a/ccm-ldn-terms/src/ccm-ldn-terms.upgrade +++ b/ccm-ldn-terms/src/ccm-ldn-terms.upgrade @@ -15,4 +15,7 @@