Merge branch 'MDL-63280_master-fix' of git://github.com/markn86/moodle

This commit is contained in:
Andrew Nicols
2018-10-26 09:07:30 +08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -634,7 +634,7 @@
<INDEXES>
<INDEX NAME="type" UNIQUE="false" FIELDS="type"/>
<INDEX NAME="convhash" UNIQUE="false" FIELDS="convhash"/>
<INDEX NAME="component-itemtype-contextid-itemid" UNIQUE="false" FIELDS="component, itemtype, contextid, itemid"/>
<INDEX NAME="component-itemtype-itemid-contextid" UNIQUE="false" FIELDS="component, itemtype, itemid, contextid"/>
</INDEXES>
</TABLE>
<TABLE NAME="message_conversation_members" COMMENT="Stores all members in a conversations">
+1 -1
View File
@@ -2643,7 +2643,7 @@ function xmldb_main_upgrade($oldversion) {
$dbman->add_key($table, $key);
// Add index.
$index = new xmldb_index('component-itemtype-contextid-itemid', XMLDB_INDEX_NOTUNIQUE, ['component', 'itemtype',
$index = new xmldb_index('component-itemtype-itemid-contextid', XMLDB_INDEX_NOTUNIQUE, ['component', 'itemtype',
'itemid', 'contextid']);
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);