Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.153.2.9 -r1.153.2.10
--- openacs-4/packages/xowiki/xowiki.info	4 Jan 2016 13:09:07 -0000	1.153.2.9
+++ openacs-4/packages/xowiki/xowiki.info	11 Feb 2016 10:06:37 -0000	1.153.2.10
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="5.9.1d3" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d3.apm">
+    <version name="5.9.1d4" url="http://openacs.org/repository/download/apm/xowiki-5.9.1d4.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2015-10-04</release-date>
@@ -55,7 +55,7 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="5.9.1d3"/>
+        <provides url="xowiki" version="5.9.1d4"/>
         <requires url="acs-datetime" version="5.9.0"/>
         <requires url="acs-kernel" version="5.9.0"/>
 	<requires url="acs-tcl" version="5.9.1d1"/>
Index: openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl,v
diff -u -r1.37.2.3 -r1.37.2.4
--- openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	2 Sep 2015 10:45:48 -0000	1.37.2.3
+++ openacs-4/packages/xowiki/tcl/xowiki-utility-procs.tcl	11 Feb 2016 10:06:38 -0000	1.37.2.4
@@ -465,6 +465,8 @@
       set tn [$cl table_name]
       set cn ${tn}_fk
       set sc [$cl info superclass]
+      set old_cn ${tn}_[$cl id_column]_fkey
+      ::xo::dc dml drop_constraint "ALTER TABLE $tn DROP constraint IF EXISTS $old_cn"
       ::xo::dc dml drop_constraint "ALTER TABLE $tn DROP constraint IF EXISTS $cn"
       ::xo::dc dml add_constraint  "ALTER TABLE $tn ADD constraint $cn FOREIGN KEY([$cl id_column]) \
         REFERENCES [$sc table_name]([$sc id_column]) ON DELETE CASCADE"
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.11.2.4 -r1.11.2.5
--- openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	5 Jan 2016 17:23:20 -0000	1.11.2.4
+++ openacs-4/packages/xowiki/tcl/upgrade/upgrade.tcl	11 Feb 2016 10:06:38 -0000	1.11.2.5
@@ -678,6 +678,17 @@
         }
       }
     }
+
+    set v 5.9.1d4
+    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"
+
+      # There are still instances having old constraint names. The updated
+      # version of the refresh-function cares about these relicts.
+      ::xowiki::refresh_id_column_fk_constraints
+    }
+
   }
     
 }