- Added support for multiple user roles. Patch by Jim Hriggs.

3 files changed, 29 insertions, 1 deletions

diff --git a/database/database.mysql b/database/database.mysql
index d8073ad79..6d900b653 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -598,6 +598,16 @@ CREATE TABLE users (
 ) TYPE=MyISAM;
 
 --
+-- Table structure for table 'users_roles'
+--
+
+CREATE TABLE users_roles (
+  uid int(10) unsigned NOT NULL default '0',
+  rid int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY (uid, rid)
+) TYPE=MyISAM;
+
+--
 -- Table structure for table 'variable'
 --
 
diff --git a/database/database.pgsql b/database/database.pgsql
index 317324bd8..a3d8a686b 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -593,6 +593,16 @@ CREATE INDEX users_changed_idx ON users(changed);
 CREATE SEQUENCE users_uid_seq INCREMENT 1 START 1;
 
 --
+-- Table structure for users_roles
+--
+
+CREATE TABLE users_roles (
+  uid integer NOT NULL default '0',
+  rid integer NOT NULL default '0',
+  PRIMARY KEY (uid, rid)
+);
+
+--
 -- Table structure for variable
 --
 
diff --git a/database/updates.inc b/database/updates.inc
index b96d29863..7e437fd4f 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -56,7 +56,8 @@ $sql_updates = array(
   "2004-02-27" => "update_82",
   "2004-04-15" => "update_83",
   "2004-04-21" => "update_84",
-  "2004-04-27" => "update_85"
+  "2004-04-27" => "update_85",
+  "2004-05-10" => "update_86"
 );
 
 function update_32() {
@@ -1075,6 +1076,13 @@ function update_85() {
   return $ret;
 }
 
+function update_86() {
+  $ret = array();
+  $ret[] = update_sql("INSERT INTO {users_roles} (uid, rid) SELECT uid, rid FROM {users}");
+  // TODO: should we verify the insert above worked before dropping rid?
+  $ret[] = update_sql("ALTER TABLE {users} DROP rid");
+}
+
 function update_sql($sql) {
   $edit = $_POST["edit"];
   $result = db_query($sql);