MDL-19695 field dependencies - before committing the dependency checker, fix all...

that will break once running with dependencies enabled

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index ec55e06b87a165d8951cda1993f6239d18adae00..0fdd39d60371253da635f1ca545c63ea3c2c50f6 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2112,12 +2112,24 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
     /// Define field blockid to be dropped from block_instances
         $field = new xmldb_field('blockid');
         if ($dbman->field_exists($table, $field)) {
+        /// Before dropping the field, drop dependent indexes
+            $index = new xmldb_index('blockid', XMLDB_INDEX_NOTUNIQUE, array('blockid'));
+            if ($dbman->index_exists($table, $index)) {
+            /// Launch drop index blockid
+                $dbman->drop_index($table, $index);
+            }
             $dbman->drop_field($table, $field);
         }
 
     /// Define field pageid to be dropped from block_instances
         $field = new xmldb_field('pageid');
         if ($dbman->field_exists($table, $field)) {
+        /// Before dropping the field, drop dependent indexes
+            $index = new xmldb_index('pageid', XMLDB_INDEX_NOTUNIQUE, array('pageid'));
+            if ($dbman->index_exists($table, $index)) {
+            /// Launch drop index pageid
+                $dbman->drop_index($table, $index);
+            }
             $dbman->drop_field($table, $field);
         }