moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-30521-m22' of git://github.com/rajeshtaneja/moodle into MOODLE_22_STABLE

Browse source
This commit is contained in:
Sam Hemelryk 2012-02-20 10:29:46 +13:00
commit 3fe335c455
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/db/install.xml
View file

@ -987,7 +987,7 @@
<FIELD NAME="subject" TYPE="char" LENGTH="128" NOTNULL="true" SEQUENCE="false" PREVIOUS="coursemoduleid" NEXT="summary"/> <FIELD NAME="subject" TYPE="char" LENGTH="128" NOTNULL="true" SEQUENCE="false" PREVIOUS="coursemoduleid" NEXT="summary"/>
<FIELD NAME="summary" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" PREVIOUS="subject" NEXT="content"/> <FIELD NAME="summary" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" PREVIOUS="subject" NEXT="content"/>
<FIELD NAME="content" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" PREVIOUS="summary" NEXT="uniquehash"/> <FIELD NAME="content" TYPE="text" LENGTH="big" NOTNULL="false" SEQUENCE="false" PREVIOUS="summary" NEXT="uniquehash"/>
<FIELD NAME="uniquehash" TYPE="char" LENGTH="128" NOTNULL="true" SEQUENCE="false" PREVIOUS="content" NEXT="rating"/> <FIELD NAME="uniquehash" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" PREVIOUS="content" NEXT="rating"/>
<FIELD NAME="rating" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="uniquehash" NEXT="format"/> <FIELD NAME="rating" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="uniquehash" NEXT="format"/>
<FIELD NAME="format" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="rating" NEXT="summaryformat"/> <FIELD NAME="format" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="rating" NEXT="summaryformat"/>
<FIELD NAME="summaryformat" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="format" NEXT="attachment"/> <FIELD NAME="summaryformat" TYPE="int" LENGTH="2" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" PREVIOUS="format" NEXT="attachment"/>

36
lib/db/upgrade.php
View file

@ -5402,7 +5402,7 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
if ($oldversion < 2010102700) { if ($oldversion < 2010102700) {
$table = new xmldb_table('post'); $table = new xmldb_table('post');
$field = new xmldb_field('uniquehash', XMLDB_TYPE_CHAR, '128', null, XMLDB_NOTNULL, null, null, 'content'); $field = new xmldb_field('uniquehash', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, 'content');
// Launch change of precision for field name // Launch change of precision for field name
$dbman->change_field_precision($table, $field); $dbman->change_field_precision($table, $field);
@ -5748,24 +5748,6 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
upgrade_main_savepoint(true, 2011011406); upgrade_main_savepoint(true, 2011011406);
} }
if ($oldversion < 2011011407) {
// Check if we need to fix post.uniquehash
$columns = $DB->get_columns('my_pages');
if (array_key_exists('uniquehash', $columns) && $columns['uniquehash']->max_length != 128) {
// Fix discrepancies in the post table after upgrade from 1.9
$table = new xmldb_table('post');
// Uniquehash should be 128 chars
// Fixed in earlier upgrade code
$field = new xmldb_field('uniquehash', XMLDB_TYPE_CHAR, 128, null, XMLDB_NOTNULL, null, null, 'content');
if ($dbman->field_exists($table, $field)) {
$dbman->change_field_precision($table, $field);
}
}
upgrade_main_savepoint(true, 2011011407);
}
if ($oldversion < 2011011408) { if ($oldversion < 2011011408) {
// Fix question in the post table after upgrade from 1.9 // Fix question in the post table after upgrade from 1.9
$columns = $DB->get_columns('question'); $columns = $DB->get_columns('question');
@ -6992,6 +6974,22 @@ FROM
upgrade_main_savepoint(true, 2011120500.03); upgrade_main_savepoint(true, 2011120500.03);
} }
if ($oldversion < 2011120501.07) {
// Check if we need to fix post.uniquehash
$columns = $DB->get_columns('post');
if (array_key_exists('uniquehash', $columns) && $columns['uniquehash']->max_length != 255) {
// Fix discrepancies in the post table after upgrade from 1.9
$table = new xmldb_table('post');
// Uniquehash should be 255 chars, fixed in earlier upgrade code
$field = new xmldb_field('uniquehash', XMLDB_TYPE_CHAR, 255, null, XMLDB_NOTNULL, null, null, 'content');
if ($dbman->field_exists($table, $field)) {
$dbman->change_field_precision($table, $field);
}
}
upgrade_main_savepoint(true, 2011120501.07);
}
return true; return true;
} }