[jan] Fix down migration of database schema.

horde · Mar 11, 2016 · ee88d33 · ee88d33
1 parent efd6169
commit ee88d33
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/framework/Dav/migration/Horde/Dav/2_horde_dav_remove_unique_index.php b/framework/Dav/migration/Horde/Dav/2_horde_dav_remove_unique_index.php
@@ -36,8 +36,19 @@ public function up()
      */
     public function down()
     {
-        $this->removeIndex('horde_dav_objects', array('id_external', 'id_collection'));
-        $this->removeIndex('horde_dav_objects', 'id_external');
+        $indexes = $this->indexes('horde_dav_objects');
+        $idx_names = array(
+            $this->indexName(
+                'horde_dav_objects',
+                array('column' => array('id_external', 'id_collection'))
+            ),
+            $this->indexName('horde_dav_objects', 'id_external')
+        );
+        foreach ($indexes as $idx) {
+            if (in_array($idx->name, $idx_names)) {
+                $this->removeIndex('horde_dav_objects', array('name' => $idx->name));
+            }
+        }
         $this->addIndex('horde_dav_objects', 'id_external', array('unique' => true));
     }
 }
diff --git a/framework/Dav/package.xml b/framework/Dav/package.xml
@@ -1096,6 +1096,19 @@
 * [jan] Fix PUT request not passing content to the backend.
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.1.3</release>
+    <api>1.1.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-12-03</date>
+   <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
+   <notes>
+* [jan] Fix down migration of database schema.
+   </notes>
+  </release>
   <release>
    <version>
     <release>2.0.0</release>