Merge branch 'MDL-66599_master' of git://github.com/dmonllao/moodle

This commit is contained in:
Jake Dallimore 2019-09-10 10:46:28 +08:00
commit e524921353
3 changed files with 19 additions and 3 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="lib/db" VERSION="20190717" COMMENT="XMLDB file for core Moodle tables"
<XMLDB PATH="lib/db" VERSION="20190905" COMMENT="XMLDB file for core Moodle tables"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
>
@ -4019,6 +4019,7 @@
</KEYS>
<INDEXES>
<INDEX NAME="modelid-action" UNIQUE="false" FIELDS="modelid, action"/>
<INDEX NAME="analysableid" UNIQUE="false" FIELDS="analysableid"/>
</INDEXES>
</TABLE>
<TABLE NAME="search_index_requests" COMMENT="Records requests for (re)indexing of specific contexts. Entries will be removed from this table when indexing of that context is complete. (This table is not used for normal time-based indexing of new content.)">
@ -4132,4 +4133,4 @@
</INDEXES>
</TABLE>
</TABLES>
</XMLDB>
</XMLDB>

View File

@ -3536,5 +3536,20 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019083000.04);
}
if ($oldversion < 2019090500.01) {
// Define index analysableid (not unique) to be added to analytics_used_analysables.
$table = new xmldb_table('analytics_used_analysables');
$index = new xmldb_index('analysableid', XMLDB_INDEX_NOTUNIQUE, ['analysableid']);
// Conditionally launch add index analysableid.
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2019090500.01);
}
return true;
}

View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019090500.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2019090500.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.