mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46182' of https://github.com/NeillM/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2014-10-08 11:28:19 +13:00
commit 2b17072b59
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/db/upgrade.php
View File

@ -358,16 +358,6 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2012042300.00) { if ($oldversion < 2012042300.00) {
// This change makes the course_section index unique. // This change makes the course_section index unique.
// xmldb does not allow changing index uniqueness - instead we must drop
// index then add it again
$table = new xmldb_table('course_sections');
$index = new xmldb_index('course_section', XMLDB_INDEX_NOTUNIQUE, array('course', 'section'));
// Conditionally launch drop index course_section
if ($dbman->index_exists($table, $index)) {
$dbman->drop_index($table, $index);
}
// Look for any duplicate course_sections entries. There should not be // Look for any duplicate course_sections entries. There should not be
// any but on some busy systems we found a few, maybe due to previous // any but on some busy systems we found a few, maybe due to previous
// bugs. // bugs.
@ -389,6 +379,19 @@ function xmldb_main_upgrade($oldversion) {
$rs->close(); $rs->close();
$transaction->allow_commit(); $transaction->allow_commit();
// XMLDB does not allow changing index uniqueness - instead we must drop
// index then add it again.
// MDL-46182: The query to make the index unique uses the index,
// so the removal of the non-unique version needs to happen after any
// data changes have been made.
$table = new xmldb_table('course_sections');
$index = new xmldb_index('course_section', XMLDB_INDEX_NOTUNIQUE, array('course', 'section'));
// Conditionally launch drop index course_section.
if ($dbman->index_exists($table, $index)) {
$dbman->drop_index($table, $index);
}
// Define index course_section (unique) to be added to course_sections // Define index course_section (unique) to be added to course_sections
$index = new xmldb_index('course_section', XMLDB_INDEX_UNIQUE, array('course', 'section')); $index = new xmldb_index('course_section', XMLDB_INDEX_UNIQUE, array('course', 'section'));