diff --git a/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/6.6.1-6.6.2/add_siteproxyprovider_inits.sql b/ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/default/6.6.1-6.6.2/add_siteproxyprovider_inits.sql similarity index 100% rename from ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/6.6.1-6.6.2/add_siteproxyprovider_inits.sql rename to ccm-atoz-siteproxy/sql/ccm-atoz-siteproxy/upgrade/default/6.6.1-6.6.2/add_siteproxyprovider_inits.sql diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/rename_decisiontree_tables.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/rename_decisiontree_tables.sql index d73cf568d..6abf4ac64 100644 --- a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/rename_decisiontree_tables.sql +++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/rename_decisiontree_tables.sql @@ -27,7 +27,7 @@ -- Rename tables ALTER TABLE cam_decision_trees RENAME TO ct_decisiontrees; ALTER TABLE cam_tree_sections RENAME TO ct_decisiontree_sections; -ALTER TABLE cam_section_options RENAME TO ct_decisiontree_section_options;cam_tre_section_tre_id_f_m_sh9 +ALTER TABLE cam_section_options RENAME TO ct_decisiontree_section_options; ALTER TABLE cam_option_targets RENAME TO ct_decisiontree_option_targets; -- Rename constraints. Because it is not possible to rename constraints we drop the old ones diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_inits.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_inits.sql index 5829f2534..5a669656d 100644 --- a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_inits.sql +++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_inits.sql @@ -17,12 +17,27 @@ -- -- $Id: upd_inits.sql $ +-- Drop constraints for init_requirements temporaly (otherwise we can't update +-- the tables) +ALTER TABLE init_requirements DROP CONSTRAINT init_requirements_init_f_cmmdn ; +ALTER TABLE init_requirements DROP CONSTRAINT init_require_requ_init_f_i6rgg ; + -- Adjust the class name of the Initializer UPDATE inits SET class_name='com.arsdigita.cms.contenttypes.DecisionTreeInitializer' - WHERE class_name='com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer' ; + WHERE class_name='com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer'; -- Adjust the class name of the Initializer in init-requirements UPDATE init_requirements SET init='com.arsdigita.cms.contenttypes.DecisionTreeInitializer' - WHERE init='com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer' ; \ No newline at end of file + WHERE init='com.arsdigita.camden.cms.contenttypes.DecisionTreeInitializer'; + +-- Restore the constraints for init_requirements +ALTER TABLE init_requirements + ADD CONSTRAINT init_requirements_init_f_cmmdn FOREIGN KEY (init) + REFERENCES inits (class_name) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION; +ALTER TABLE init_requirements + ADD CONSTRAINT init_require_requ_init_f_i6rgg FOREIGN KEY (required_init) + REFERENCES inits (class_name) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION; diff --git a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql index f9ddedd7b..6c2d34c9f 100644 --- a/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql +++ b/ccm-cms-types-decisiontree/sql/ccm-cms-types-decisiontree/upgrade/default/1.0.3-6.6.0/update_system_tables.sql @@ -1,5 +1,6 @@ -- -- Copyright (C) 2013 Peter Boy. All Rights Reserved. +-- Copyright (C) 2013 Jens . 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 @@ -18,20 +19,30 @@ -- $Id: upd_acs_objects.sql $ -- Adjust the class name in acs-objects for all DecisionTree instances -update acs_objects - set (object_type,default_domain_class) = - ('com.arsdigita.cms.contenttypes.DecisionTree' , - 'com.arsdigita.cms.contenttypes.DecisionTree' ) - where default_domain_class - like 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ; +UPDATE acs_objects + SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTree', + default_domain_class = 'com.arsdigita.cms.contenttypes.DecisionTree' + WHERE default_domain_class = 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ; --Adjust content type decisiontree in contenttype directory table -update content_types - set (object_type,classname) = - ('com.arsdigita.cms.contenttypes.DecisionTree' , - 'com.arsdigita.cms.contenttypes.DecisionTree' ) - where object_type - like 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ; +UPDATE content_types + SET object_type = 'com.arsdigita.cms.contenttypes.DecisionTree', + classname = 'com.arsdigita.cms.contenttypes.DecisionTree' + WHERE object_type = 'com.arsdigita.camden.cms.contenttypes.DecisionTree' ; --Adjust content type decisiontree in authoring_steps directory table -update authoring_steps +UPDATE authoring_steps + SET component = 'com.arsdigita.cms.contenttypes.ui.DecisionTreePropertiesStep' + WHERE component = 'com.arsdigita.camden.cms.contenttypes.ui.DecisionTreePropertiesStep'; + +UPDATE authoring_steps + SET component = 'com.arsdigita.cms.contenttypes.ui.DecisionTreeSectionStep' + WHERE component = 'com.arsdigita.camden.cms.contenttypes.ui.DecisionTreeViewSections'; + +UPDATE authoring_steps + SET component = 'com.arsdigita.cms.contenttypes.ui.DecisionTreeOptionStep' + WHERE component = 'com.arsdigita.camden.cms.contenttypes.ui.DecisionTreeViewOptions'; + +UPDATE authoring_steps + SET component = 'com.arsdigita.cms.contenttypes.ui.DecisionTreeTargetStep' + WHERE component = 'com.arsdigita.camden.cms.contenttypes.ui.DecisionTreeViewTargets'; diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql index 1c668f922..29781533d 100644 --- a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql +++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql @@ -1,3 +1,3 @@ -alter table forum_forums add anonymous_posts_allowed BOOLEAN NOT NULL; +alter table forum_forums add anonymous_posts_allowed BOOLEAN NOT NULL DEFAULT FALSE; update forum_forums set anonymous_posts_allowed = FALSE; diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql index 0f1cacff1..d5f84d73a 100644 --- a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql +++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql @@ -16,7 +16,7 @@ alter table forum_post_files add -alter table forum_forums add file_attachments_allowed BOOLEAN NOT NULL; +alter table forum_forums add file_attachments_allowed BOOLEAN NOT NULL DEFAULT TRUE; update forum_forums set file_attachments_allowed = TRUE; diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql index 2cb31d9ac..b9e5aa6c7 100644 --- a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql +++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql @@ -1,3 +1,3 @@ -alter table forum_forums add no_category_posts_allowed BOOLEAN NOT NULL; +alter table forum_forums add no_category_posts_allowed BOOLEAN NOT NULL DEFAULT TRUE; update forum_forums set no_category_posts_allowed = TRUE; diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql index 2643fa63f..e92fa8503 100644 --- a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql +++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql @@ -15,7 +15,7 @@ alter table forum_post_images add references forum_posts(post_id); -alter table forum_forums add image_uploads_allowed BOOLEAN NOT NULL; +alter table forum_forums add image_uploads_allowed BOOLEAN NOT NULL DEFAULT FALSE; update forum_forums set image_uploads_allowed = FALSE; diff --git a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql index 62a16c4d7..839cd8b3e 100644 --- a/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql +++ b/ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql @@ -1,4 +1,4 @@ -alter table forum_forums add subscribe_thread_starter BOOLEAN NOT NULL; +alter table forum_forums add subscribe_thread_starter BOOLEAN NOT NULL DEFAULT FALSE; update forum_forums set subscribe_thread_starter = FALSE; diff --git a/ccm-ldn-aplaws/sql/upgrade/oracle-se-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/oracle-se-0.0.0-6.6.1.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-0.0.0-6.6.1.sql diff --git a/ccm-ldn-aplaws/sql/upgrade/oracle-se-1.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-1.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/oracle-se-1.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-1.sql diff --git a/ccm-ldn-aplaws/sql/upgrade/oracle-se-2.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-2.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/oracle-se-2.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/oracle-se-2.sql diff --git a/ccm-ldn-aplaws/sql/upgrade/postgres-0.0.0-6.6.1.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/postgres-0.0.0-6.6.1.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-0.0.0-6.6.1.sql diff --git a/ccm-ldn-aplaws/sql/upgrade/postgres-1.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-1.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/postgres-1.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-1.sql diff --git a/ccm-ldn-aplaws/sql/upgrade/postgres-2.sql b/ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-2.sql similarity index 100% rename from ccm-ldn-aplaws/sql/upgrade/postgres-2.sql rename to ccm-ldn-aplaws/sql/upgrade/ccm-ldn-aplaws/postgres-2.sql diff --git a/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/6.6.1-6.6.2/add_domainprovider_inits.sql b/ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/6.6.1-6.6.2/add_domainprovider_inits.sql similarity index 100% rename from ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/6.6.1-6.6.2/add_domainprovider_inits.sql rename to ccm-ldn-atoz/sql/ccm-ldn-atoz/upgrade/default/6.6.1-6.6.2/add_domainprovider_inits.sql