Merge branch 'MDL-50385-master' of git://github.com/merrill-oakland/moodle
[moodle.git] / lib / db / upgrade.php
index 1232d83..7e04aed 100644 (file)
@@ -1399,5 +1399,22 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2016021500.00);
     }
 
+    if ($oldversion < 2016021501.00) {
+        // This could take a long time. Unfortunately, no way to know how long, and no way to do progress, so setting for 1 hour.
+        upgrade_set_timeout(3600);
+
+        // Define index userid-itemid (not unique) to be added to grade_grades_history.
+        $table = new xmldb_table('grade_grades_history');
+        $index = new xmldb_index('userid-itemid-timemodified', XMLDB_INDEX_NOTUNIQUE, array('userid', 'itemid', 'timemodified'));
+
+        // Conditionally launch add index userid-itemid.
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2016021501.00);
+    }
+
     return true;
 }