diff --git a/lib/db/install.xml b/lib/db/install.xml index 96312907b57..c924dbaf033 100644 --- a/lib/db/install.xml +++ b/lib/db/install.xml @@ -1,5 +1,5 @@ - @@ -1306,24 +1306,6 @@ - - - - - - - - - - - - - - - - - -
@@ -4114,4 +4096,4 @@
-
\ No newline at end of file + diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php index 76dc1431776..a9dec83ce23 100644 --- a/lib/db/upgrade.php +++ b/lib/db/upgrade.php @@ -3000,5 +3000,19 @@ function xmldb_main_upgrade($oldversion) { upgrade_main_savepoint(true, 2019041300.01); } + if ($oldversion < 2019042200.00) { + + // Define table role_sortorder to be dropped. + $table = new xmldb_table('role_sortorder'); + + // Conditionally launch drop table for role_sortorder. + if ($dbman->table_exists($table)) { + $dbman->drop_table($table); + } + + // Main savepoint reached. + upgrade_main_savepoint(true, 2019042200.00); + } + return true; } diff --git a/privacy/tests/provider_test.php b/privacy/tests/provider_test.php index 95f652510bb..ce6c4435345 100644 --- a/privacy/tests/provider_test.php +++ b/privacy/tests/provider_test.php @@ -303,10 +303,6 @@ class provider_testcase extends advanced_testcase { $tablelist = $structure->getTables(); foreach ($tablelist as $table) { - if ($table->getName() === 'role_sortorder') { - // TODO MDL-62459 this table is not used anywhere. Remove the table and this statement. - continue; - } if ($fields = $this->get_userid_fields($table)) { $tables[$table->getName()] = ' - ' . $table->getName() . ' (' . join(', ', $fields) . ')'; } diff --git a/version.php b/version.php index c6d2eb504e9..03a62d6625f 100644 --- a/version.php +++ b/version.php @@ -29,7 +29,7 @@ defined('MOODLE_INTERNAL') || die(); -$version = 2019041800.00; // YYYYMMDD = weekly release date of this DEV branch. +$version = 2019042200.00; // YYYYMMDD = weekly release date of this DEV branch. // RR = release increments - 00 in DEV branches. // .XX = incremental changes.