MDL-59116 analytics: Add rangeindex field to predict_samples index

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index f2770f9..638044f 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2255,7 +2255,7 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2017072700.02);
     }
 
-    if ($oldversion < 2017080700.00) {
+    if ($oldversion < 2017080700.01) {
 
         // Get the table by its previous name.
         $table = new xmldb_table('analytics_predict_ranges');
@@ -2286,8 +2286,26 @@ function xmldb_main_upgrade($oldversion) {
             $dbman->rename_table($table, 'analytics_predict_samples');
         }
 
+        $table = new xmldb_table('analytics_predict_samples');
+
+        $index = new xmldb_index('modelidandanalysableidandtimesplitting', XMLDB_INDEX_NOTUNIQUE,
+            array('modelid', 'analysableid', 'timesplitting'));
+
+        // Conditionally launch drop index.
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+
+        $index = new xmldb_index('modelidandanalysableidandtimesplittingandrangeindex', XMLDB_INDEX_NOTUNIQUE,
+            array('modelid', 'analysableid', 'timesplitting', 'rangeindex'));
+
+        // Conditionally launch add index.
+        if (!$dbman->index_exists($table, $index)) {
+            $dbman->add_index($table, $index);
+        }
+
         // Main savepoint reached.
-        upgrade_main_savepoint(true, 2017080700.00);
+        upgrade_main_savepoint(true, 2017080700.01);
     }
 
     return true;

diff --git a/version.php b/version.php
index 6c7ed20..b44ec9d 100644 (file)
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2017080700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2017080700.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.