mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Sam Hemelryk 2013-03-04 14:35:59 +13:00
commit 4ce761716c
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/db/install.xml
View File

@ -1984,6 +1984,7 @@
</KEYS>
<INDEXES>
<INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/>
<INDEX NAME="timemodified" UNIQUE="false" FIELDS="timemodified"/>
</INDEXES>
</TABLE>
<TABLE NAME="grade_import_newitem" COMMENT="temporary table for storing new grade_item names from grade import">

16
lib/db/upgrade.php
View File

@ -1670,5 +1670,21 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013022600.00);
}
// Add index to field "timemodified" for grade_grades_history table.
if ($oldversion < 2013030400.00) {
$table = new xmldb_table('grade_grades_history');
$field = new xmldb_field('timemodified');
if ($dbman->field_exists($table, $field)) {
$index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2013030400.00);
}
return true;
}

2
version.php
View File

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