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

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

htdocs/lib/db/install.xml

@@ -524,32 +524,6 @@
             </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" />
@@ -786,18 +760,6 @@
                 <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

@@ -405,6 +405,18 @@ 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

@@ -27,8 +27,8 @@
 defined('INTERNAL') || die();
 
 $config = new StdClass;
-$config->version = 2007072800;
-$config->release = '0.8.0';
+$config->version = 2007072801;
+$config->release = '0.8.1';
 $config->minupgradefrom = 2007011600;
 $config->minupgraderelease = '0.4.0 (build tag BUILD_20070122)';
 $config->disablelogin = true;