Merge branch 'MDL-63493-master' of git://github.com/junpataleta/moodle

This commit is contained in:
Andrew Nicols 2018-10-02 11:40:20 +08:00
commit 13976bcf83

View File

@ -2167,7 +2167,7 @@ function xmldb_main_upgrade($oldversion) {
$table = new xmldb_table('message_user_actions');
// Conditionally launch add index.
$index = new xmldb_index('userid_messageid_action', XMLDB_INDEX_UNIQUE, array('userid, messageid, action'));
$index = new xmldb_index('userid_messageid_action', XMLDB_INDEX_UNIQUE, array('userid', 'messageid', 'action'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
@ -2181,7 +2181,7 @@ function xmldb_main_upgrade($oldversion) {
$table = new xmldb_table('messages');
// Conditionally launch add index.
$index = new xmldb_index('conversationid_timecreated', XMLDB_INDEX_NOTUNIQUE, array('conversationid, timecreated'));
$index = new xmldb_index('conversationid_timecreated', XMLDB_INDEX_NOTUNIQUE, array('conversationid', 'timecreated'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
@ -2373,7 +2373,7 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2018092100.02) {
$table = new xmldb_table('question');
$index = new xmldb_index('categoryidnumber', XMLDB_INDEX_UNIQUE, array('category, idnumber'));
$index = new xmldb_index('categoryidnumber', XMLDB_INDEX_UNIQUE, array('category', 'idnumber'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
@ -2391,7 +2391,7 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2018092100.04) {
$table = new xmldb_table('question_categories');
$index = new xmldb_index('contextididnumber', XMLDB_INDEX_UNIQUE, array('contextid, idnumber'));
$index = new xmldb_index('contextididnumber', XMLDB_INDEX_UNIQUE, array('contextid', 'idnumber'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}