L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-25948 upgrade: Fixing issues with upgrade from < 1.7 to 2.x.

Browse Source
This commit is contained in:
Mark Nelson
2012-11-09 15:06:29 +08:00
parent f47b2e4a24
commit d1bed0abc3
2 changed files with 66 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+65
View File
@@ -1061,6 +1061,8 @@ function xmldb_main_upgrade($oldversion) {
}
if ($oldversion < 2009010602) {
// Issue with field in the user table being null in postgres.
$DB->execute("UPDATE {user} SET lastip = '' WHERE lastip IS NULL");
/// Changing precision of field lastip on table user to (45)
$table = new xmldb_table('user');
@@ -4708,6 +4710,10 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
if ($dbman->index_exists($table, $index)) {
$dbman->drop_index($table, $index);
}
// Issue with field in the user table being null in postgres.
$DB->execute("UPDATE {user} SET city = '' WHERE city IS NULL");
/// Changing precision of field city on table user to (120)
$field = new xmldb_field('city', XMLDB_TYPE_CHAR, '120', null, XMLDB_NOTNULL, null, null, 'address');
@@ -7159,5 +7165,64 @@ FROM
upgrade_main_savepoint(true, 2011120504.12);
}
if ($oldversion < 2011120505.08) {
// Issue with Moodle version < 1.7 using postgres having null values in the user table.
if ($DB->get_dbfamily() === 'postgres') {
// Update picture field to 0.
$DB->execute("UPDATE {user} SET picture = '0' WHERE picture IS NULL");
// Update the other fields to empty string.
$arrfields = array('idnumber', 'icq', 'skype', 'yahoo', 'aim', 'msn',
'phone1', 'phone2', 'institution', 'department',
'address', 'city', 'country', 'lastip', 'secret',
'url');
foreach ($arrfields as $field) {
$DB->execute("UPDATE {user} SET $field = '' WHERE $field IS NULL");
}
$table = new xmldb_table('user');
// Need to remove indexes in order to edit some fields.
$arrindexes = array();
$arrindexes[] = new xmldb_index('idnumber', XMLDB_INDEX_NOTUNIQUE, array('idnumber'));
$arrindexes[] = new xmldb_index('city', XMLDB_INDEX_NOTUNIQUE, array('city'));
$arrindexes[] = new xmldb_index('country', XMLDB_INDEX_NOTUNIQUE, array('country'));
foreach ($arrindexes as $index) {
if ($dbman->index_exists($table, $index)) {
$dbman->drop_index($table, $index);
}
}
$arrfields = array();
$arrfields[] = new xmldb_field('idnumber', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, '', 'password');
$arrfields[] = new xmldb_field('icq', XMLDB_TYPE_CHAR, '15', null, XMLDB_NOTNULL, null, '', 'emailstop');
$arrfields[] = new xmldb_field('skype', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, '', 'icq');
$arrfields[] = new xmldb_field('yahoo', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, '', 'skype');
$arrfields[] = new xmldb_field('aim', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, '', 'yahoo');
$arrfields[] = new xmldb_field('msn', XMLDB_TYPE_CHAR, '50', null, XMLDB_NOTNULL, null, '', 'aim');
$arrfields[] = new xmldb_field('phone1', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, '', 'msn');
$arrfields[] = new xmldb_field('phone2', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, '', 'phone1');
$arrfields[] = new xmldb_field('institution', XMLDB_TYPE_CHAR, '40', null, XMLDB_NOTNULL, null, '', 'phone2');
$arrfields[] = new xmldb_field('department', XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, '', 'institution');
$arrfields[] = new xmldb_field('address', XMLDB_TYPE_CHAR, '70', null, XMLDB_NOTNULL, null, '', 'department');
$arrfields[] = new xmldb_field('city', XMLDB_TYPE_CHAR, '120', null, XMLDB_NOTNULL, null, '', 'address');
$arrfields[] = new xmldb_field('country', XMLDB_TYPE_CHAR, '2', null, XMLDB_NOTNULL, null, '', 'city');
$arrfields[] = new xmldb_field('lastip', XMLDB_TYPE_CHAR, '45', null, XMLDB_NOTNULL, null, '', 'country');
$arrfields[] = new xmldb_field('secret', XMLDB_TYPE_CHAR, '15', null, XMLDB_NOTNULL, null, '', 'lastip');
$arrfields[] = new xmldb_field('picture', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, 0, 'secret');
$arrfields[] = new xmldb_field('url', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, '', 'picture');
foreach ($arrfields as $field) {
if ($dbman->field_exists($table, $field)) {
$dbman->change_field_notnull($table, $field);
}
}
// Re-add the indexes.
foreach ($arrindexes as $index) {
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
}
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2011120505.08);
}
return true;
}
version.php
+1 -1
View File
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2011120505.07; // 20111205 = branching date YYYYMMDD - do not modify!
$version = 2011120505.08; // 20111205 = branching date YYYYMMDD - do not modify!
// RR = release increments - 00 in DEV branches
// .XX = incremental changes