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

Merge branch 'wip-MDL-55652-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2017-10-09 12:42:53 +08:00
commit 2e30e9aa0d
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/db/install.xml
View File

@ -815,6 +815,7 @@
</KEYS> </KEYS>
<INDEXES> <INDEXES>
<INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/> <INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/>
<INDEX NAME="timemodified" UNIQUE="false" FIELDS="timemodified"/>
</INDEXES> </INDEXES>
</TABLE> </TABLE>
<TABLE NAME="stats_daily" COMMENT="to accumulate daily stats"> <TABLE NAME="stats_daily" COMMENT="to accumulate daily stats">
@ -1816,6 +1817,7 @@
</KEYS> </KEYS>
<INDEXES> <INDEXES>
<INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/> <INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/>
<INDEX NAME="timemodified" UNIQUE="false" FIELDS="timemodified"/>
</INDEXES> </INDEXES>
</TABLE> </TABLE>
<TABLE NAME="grade_categories_history" COMMENT="History of grade_categories"> <TABLE NAME="grade_categories_history" COMMENT="History of grade_categories">
@ -1848,6 +1850,7 @@
</KEYS> </KEYS>
<INDEXES> <INDEXES>
<INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/> <INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/>
<INDEX NAME="timemodified" UNIQUE="false" FIELDS="timemodified"/>
</INDEXES> </INDEXES>
</TABLE> </TABLE>
<TABLE NAME="grade_items_history" COMMENT="History of grade_items"> <TABLE NAME="grade_items_history" COMMENT="History of grade_items">
@ -1898,6 +1901,7 @@
</KEYS> </KEYS>
<INDEXES> <INDEXES>
<INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/> <INDEX NAME="action" UNIQUE="false" FIELDS="action" COMMENT="insert/update/delete"/>
<INDEX NAME="timemodified" UNIQUE="false" FIELDS="timemodified"/>
</INDEXES> </INDEXES>
</TABLE> </TABLE>
<TABLE NAME="grade_grades_history" COMMENT="History table"> <TABLE NAME="grade_grades_history" COMMENT="History table">
@ -3721,4 +3725,4 @@
</INDEXES> </INDEXES>
</TABLE> </TABLE>
</TABLES> </TABLES>
</XMLDB> </XMLDB>

35
lib/db/upgrade.php
View File

@ -2601,5 +2601,40 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2017092900.00); upgrade_main_savepoint(true, 2017092900.00);
} }
if ($oldversion < 2017100900.00) {
// Add index on time modified to grade_outcomes_history, grade_categories_history,
// grade_items_history, and scale_history.
$table = new xmldb_table('grade_outcomes_history');
$index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
$table = new xmldb_table('grade_items_history');
$index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
$table = new xmldb_table('grade_categories_history');
$index = new xmldb_index('timemodified', XMLDB_INDEX_NOTUNIQUE, array('timemodified'));
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
$table = new xmldb_table('scale_history');
$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, 2017100900.00);
}
return true; return true;
} }

2
version.php
View File

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