Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 04:42:53 +0000 (12:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 04:42:53 +0000 (12:42 +0800)
1  2 
lib/db/upgrade.php
version.php

@@@ -2601,5 -2601,40 +2601,40 @@@ function xmldb_main_upgrade($oldversion
          upgrade_main_savepoint(true, 2017092900.00);
      }
  
 -    if ($oldversion < 2017092901.00) {
++    if ($oldversion < 2017100900.00) {
+         // Add index on time modified to grade_outcomes_history, grade_categories_history,
+         // grade_items_history, and scale_history.
+         $table = new xmldb_table('grade_outcomes_history');
+         $index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
+         if (!$dbman->index_exists($table, $index)) {
+             $dbman->add_index($table, $index);
+         }
+         $table = new xmldb_table('grade_items_history');
+         $index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
+         if (!$dbman->index_exists($table, $index)) {
+             $dbman->add_index($table, $index);
+         }
+         $table = new xmldb_table('grade_categories_history');
+         $index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
+         if (!$dbman->index_exists($table, $index)) {
+             $dbman->add_index($table, $index);
+         }
+         $table = new xmldb_table('scale_history');
+         $index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
+         if (!$dbman->index_exists($table, $index)) {
+             $dbman->add_index($table, $index);
+         }
+         // Main savepoint reached.
 -        upgrade_main_savepoint(true, 2017092901.00);
++        upgrade_main_savepoint(true, 2017100900.00);
+     }
      return true;
  }
diff --cc version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2017100600.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2017092901.00;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2017100900.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.