[jan] Fix migration with Oracle.

horde · Nov 17, 2014 · 870c6e7 · 870c6e7
1 parent 2d384c6
commit 870c6e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/framework/History/migration/Horde/History/4_horde_history_add_compositeindex.php b/framework/History/migration/Horde/History/4_horde_history_add_compositeindex.php
@@ -10,10 +10,12 @@ public function down()
     {
         // Older installs may have indexes differently named.
         $indexes = $this->indexes('horde_histories');
+        $idx_name = $this->indexName('horde_histories', array('column' => array('history_modseq', 'object_uid')));
         $modseq_idx_name = $this->indexName('horde_histories', 'history_modseq');
         $object_idx_name = $this->indexName('horde_histories', 'object_uid');
         foreach ($indexes as $idx) {
             switch ($idx->name) {
+            case $idx_name:
             case $modseq_idx_name:
             case $object_idx_name:
                 $this->removeIndex('horde_histories', array('name' => $idx->name));

diff --git a/framework/History/package.xml b/framework/History/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [jan] Fix migration with Oracle.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -525,7 +525,7 @@ Converted to package.xml 2.0 for pear.horde.org
    <date>2014-11-10</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [jan] Fix migration with Oracle.
    </notes>
   </release>
  </changelog>