From 7dd6c3a42b531b4545aeb9fadbc1e22335a63939 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 10 Dec 2014 21:01:29 +0000 Subject: [PATCH] Fixed upgrade ccm-themedirector-6.6.1-6.6.2. Upgrade was not aware of some constraints which are may violated during the upgrade. git-svn-id: https://svn.libreccm.org/ccm/trunk@3032 8810af33-2d31-482b-a856-94f89814c4df --- .../default/6.6.1-6.6.2/upd_system_tables.sql | 43 +++++++++++++++++-- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql index 94864c3a0..9e6d24f7e 100644 --- a/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql +++ b/ccm-themedirector/sql/ccm-themedirector/upgrade/default/6.6.1-6.6.2/upd_system_tables.sql @@ -22,14 +22,16 @@ update application_types set title='Theme Director', - package_type_id=null - where object_type='com.arsdigita.themedirector.ThemeDirector' ; + package_type_id = null + where object_type = 'com.arsdigita.themedirector.ThemeDirector' ; -update applications - set package_id=null + update applications + set package_id = null where primary_url = '/admin/themes/' ; -- table site_nodes +alter table site_nodes drop constraint site_nodes_parent_id_f_sacav; + delete from site_nodes where name like '%theme%' ; @@ -53,7 +55,40 @@ delete from object_context like '%com.arsdigita.kernel%' AND acs_objects.display_name like 'CCM Themes Admin') ; +delete from object_context + where object_id in (select object_id + from acs_objects + where object_type like '%com.arsdigita.kernel%' + and display_name like '%hemes%'); + +delete from object_context + where context_id in (select object_id + from acs_objects + where object_type like '%com.arsdigita.kernel%' + and display_name like '%hemes%'); + +alter table site_nodes drop constraint site_nodes_node_id_f_n1m2y; + +alter table site_nodes drop constraint site_nodes_object_id_f_ked74; + +delete from apm_packages + where package_id in (select object_id + from acs_objects + where object_type like '%com.arsdigita.kernel%' + and display_name like '%hemes%'); + delete from acs_objects where object_type like '%com.arsdigita.kernel%' AND display_name like '%hemes%' ; +alter table site_nodes add + constraint site_nodes_parent_id_f_sacav foreign key (parent_id) + references site_nodes(node_id); + +alter table site_nodes add + constraint site_nodes_node_id_f_n1m2y foreign key (node_id) + references acs_objects(object_id); + +alter table site_nodes add + constraint site_nodes_object_id_f_ked74 foreign key (object_id) + references apm_packages(package_id); \ No newline at end of file