Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.180.2.100 -r1.180.2.101 --- openacs-4/packages/xowiki/xowiki.info 2 Jun 2022 09:28:29 -0000 1.180.2.100 +++ openacs-4/packages/xowiki/xowiki.info 13 Jun 2022 16:50:33 -0000 1.180.2.101 @@ -10,7 +10,7 @@ t xowiki - + Gustaf Neumann A xotcl-based enterprise wiki system with multiple object types 2021-09-15 @@ -55,7 +55,7 @@ BSD-Style 2 - + Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.542.2.158 -r1.542.2.159 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 6 May 2022 18:36:00 -0000 1.542.2.158 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 13 Jun 2022 16:50:33 -0000 1.542.2.159 @@ -107,7 +107,7 @@ -slots { ::xo::db::CrAttribute create page_template \ -datatype integer \ - -references "cr_items(item_id) ON DELETE CASCADE" + -references "cr_items(item_id)" ::xo::db::CrAttribute create instance_attributes \ -sqltype long_text \ -default "" Index: openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl,v diff -u -r1.15.2.14 -r1.15.2.15 --- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 16 Sep 2021 09:49:47 -0000 1.15.2.14 +++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl 13 Jun 2022 16:50:33 -0000 1.15.2.15 @@ -901,6 +901,24 @@ ns_log notice "Modified prototype pages for $page: $item_ids (require manual checking)" } } + + set v 5.10.1d31 + if {[apm_version_names_compare $from_version_name $v] == -1 && + [apm_version_names_compare $to_version_name $v] > -1} { + ns_log notice "-- upgrading to $v" + + if {[::xo::dc 0or1row constraint_exists { + SELECT 1 FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS + WHERE CONSTRAINT_NAME ='xowiki_page_instance_page_template_fkey' + AND TABLE_NAME = 'xowiki_page_instance'}]} { + ::xo::dc transaction { + ::xo::dc dml drop_constraint \ + "alter table xowiki_page_instance drop constraint xowiki_page_instance_page_template_fkey" + ::xo::dc dml recreate_constraint \ + "alter table xowiki_page_instance add constraint xowiki_page_instance_page_template_fkey foreign key (page_template) references cr_items(item_id)" + } + } + } } }