Skip to content

GitLab

Commit bf8b38bf authored by Nigel McNie's avatar Nigel McNie
Browse files

Revert "Upgrade to remove group tables from Mahara. They'll be back, as... 

Revert "Upgrade to remove group tables from Mahara. They'll be back, as renamed community tables, but for now, farewell! *plays taps*"

Back they come... stupid wrong branch...

This reverts commit 035ebd5d.
parent 035ebd5d
Hide whitespace changes
Inline Side-by-side
htdocs/lib/db/install.xml
View file @ bf8b38bf
......@@ -524,6 +524,32 @@
</KEYS>
</TABLE>
<!-- user related tables -->
<TABLE NAME="usr_group">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true" />
<FIELD NAME="name" TYPE="text" NOTNULL="true" />
<FIELD NAME="owner" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="description" TYPE="text" NOTNULL="false" />
<FIELD NAME="ctime" TYPE="datetime" NOTNULL="true" />
<FIELD NAME="mtime" TYPE="datetime" NOTNULL="true" />
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" />
<KEY NAME="ownerfk" TYPE="foreign" FIELDS="owner" REFTABLE="usr" REFFIELDS="id" />
</KEYS>
</TABLE>
<TABLE NAME="usr_group_member">
<FIELDS>
<FIELD NAME="grp" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="member" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="ctime" TYPE="datetime" NOTNULL="true" />
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="grp,member" />
<KEY NAME="grpfk" TYPE="foreign" FIELDS="grp" REFTABLE="usr_group" REFFIELDS="id" />
<KEY NAME="memberfk" TYPE="foreign" FIELDS="member" REFTABLE="usr" REFFIELDS="id" />
</KEYS>
</TABLE>
<TABLE NAME="usr_account_preference">
<FIELDS>
<FIELD NAME="usr" TYPE="int" LENGTH="10" NOTNULL="true" />
......@@ -760,6 +786,18 @@
<KEY NAME="communityfk" TYPE="foreign" FIELDS="community" REFTABLE="community" REFFIELDS="id" />
</KEYS>
</TABLE>
<TABLE NAME="view_access_group">
<FIELDS>
<FIELD NAME="view" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="grp" TYPE="int" LENGTH="10" NOTNULL="true" />
<FIELD NAME="startdate" TYPE="datetime" NOTNULL="false" />
<FIELD NAME="stopdate" TYPE="datetime" NOTNULL="false" />
</FIELDS>
<KEYS>
<KEY NAME="viewfk" TYPE="foreign" FIELDS="view" REFTABLE="view" REFFIELDS="id" />
<KEY NAME="grpfk" TYPE="foreign" FIELDS="grp" REFTABLE="usr_group" REFFIELDS="id" />
</KEYS>
</TABLE>
<TABLE NAME="view_access_usr">
<FIELDS>
<FIELD NAME="view" TYPE="int" LENGTH="10" NOTNULL="true" />
......
htdocs/lib/db/upgrade.php
View file @ bf8b38bf
......@@ -405,18 +405,6 @@ function xmldb_core_upgrade($oldversion=0) {
}
if ($oldversion < 2007072801) {
// Remove groups from the system
$table = new XMLDBTable('view_access_group');
drop_table($table);
$table = new XMLDBTable('usr_group_member');
drop_table($table);
$table = new XMLDBTable('usr_group');
drop_table($table);
}
return $status;
}
......
htdocs/lib/version.php
View file @ bf8b38bf
......@@ -27,8 +27,8 @@
defined('INTERNAL') || die();
$config = new StdClass;
$config->version = 2007072801;
$config->release = '0.8.1';
$config->version = 2007072800;
$config->release = '0.8.0';
$config->minupgradefrom = 2007011600;
$config->minupgraderelease = '0.4.0 (build tag BUILD_20070122)';
$config->disablelogin = true;
......
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