Commit 595ed02f authored by Nigel McNie's avatar Nigel McNie
Browse files

Remove the 'institution' column from the usr table (second time around, this...

Remove the 'institution' column from the usr table (second time around, this time remove from install.xml too!). Remove the redundant (copied from Moodle) 'updateuserinfoonlogin' column from the institution table.
parent 5c0e2cfa
......@@ -27,7 +27,6 @@
<FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true"/>
<FIELD NAME="displayname" TYPE="char" LENGTH="255" NOTNULL="true"/>
<FIELD NAME="registerallowed" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1"/>
<FIELD NAME="updateuserinfoonlogin" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0"/>
<FIELD NAME="theme" TYPE="char" LENGTH="255" NOTNULL="false"/>
<FIELD NAME="defaultmembershipperiod" TYPE="int" NOTNULL="false" />
<FIELD NAME="maxuseraccounts" TYPE="int" NOTNULL="false" />
......@@ -63,7 +62,6 @@
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="username" TYPE="char" LENGTH="30" NOTNULL="true"/>
<FIELD NAME="password" TYPE="char" LENGTH="40" NOTNULL="true"/>
<FIELD NAME="institution" TYPE="char" LENGTH="255" NOTNULL="true" DEFAULT="mahara"/>
<FIELD NAME="salt" TYPE="char" LENGTH="8"/>
<FIELD NAME="passwordchange" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0"/>
<FIELD NAME="active" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="1"/>
......
......@@ -810,6 +810,21 @@ function xmldb_core_upgrade($oldversion=0) {
table_column('usr_registration', null, 'lang', 'text', null, null, '', '');
}
if ($oldversion < 2008012500) {
// _Really_ remove the institution field this time (also from install.xml!)
$table = new XMLDBTable('usr');
$field = new XMLDBField('institution');
$field->setAttributes(XMLDB_TYPE_CHAR, 255, XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, 'mahara');
drop_field($table, $field);
// Remove the updateuserinfoonlogin column from the institution table.
// It's copied from Moodle, and not used by Mahara
$table = new XMLDBTable('institution');
$field = new XMLDBField('updateuserinfoonlogin');
$field->setAttributes(XMLDB_TYPE_INTEGER, 1, XMLDB_UNSIGNED, null, null, null, null, 0);
drop_field($table, $field);
}
return $status;
}
......
......@@ -27,7 +27,7 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2008012401;
$config->version = 2008012500;
$config->release = '1.0.0alpha2dev';
$config->minupgradefrom = 2007080700;
$config->minupgraderelease = '0.8.0 (release tag 0.8.0_RELEASE)';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment