Permalink
Browse files

Merge branch 'wip-mdl-30521-m21' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_21_STABLE
  • Loading branch information...
2 parents e0d5a17 + 2f20a79 commit a005b98ba74d71d025735f2ed0f6179925862945 Sam Hemelryk committed Feb 19, 2012
Showing with 18 additions and 20 deletions.
  1. +1 −1 lib/db/install.xml
  2. +17 −19 lib/db/upgrade.php
View
@@ -985,7 +985,7 @@
<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="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="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"/>
View
@@ -5444,7 +5444,7 @@ function xmldb_main_upgrade($oldversion) {
if ($oldversion < 2010102700) {
$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
$dbman->change_field_precision($table, $field);
@@ -5790,24 +5790,6 @@ function xmldb_main_upgrade($oldversion) {
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) {
// Fix question in the post table after upgrade from 1.9
$columns = $DB->get_columns('question');
@@ -6724,6 +6706,22 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2011070103.04);
}
+ if ($oldversion < 2011070104.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, 2011070104.07);
+ }
return true;
}

0 comments on commit a005b98

Please sign in to comment.