From: moodler <moodler>
Date: Tue, 30 Dec 2003 18:07:09 +0000 (+0000)
Subject: Need to change table name!  It was tougher than I thought to work around
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0da33e07b9fc5e0592e97f95ebd1647964b4d162;p=moodle.git

Need to change table name!  It was tougher than I thought to work around
the reserved word "group"
---

diff --git a/lib/datalib.php b/lib/datalib.php
index 94041ef25c..fefcdc2c62 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -945,9 +945,9 @@ function get_user_info_from_db($field, $value) {
         }
     }
 
-    if ($groups = get_records("group_members", "userid", $user->id)) {
+    if ($groups = get_records("groups_members", "userid", $user->id)) {
         foreach ($groups as $group) {
-            $courseid = get_field("group", "courseid", "id", $group->id);
+            $courseid = get_field("groups", "courseid", "id", $group->id);
             $user->groupmember[$courseid] = $group->id;
         }
     }
@@ -1440,8 +1440,8 @@ function get_groups($courseid, $userid=0) {
     }
 
     return get_records_sql("SELECT DISTINCT g.*
-                              FROM {$CFG->prefix}group g,
-                                   {$CFG->prefix}group_members m 
+                              FROM {$CFG->prefix}groups g,
+                                   {$CFG->prefix}groups_members m 
                              WHERE g.courseid = '$courseid' $userselect ");
 }
 
@@ -1455,7 +1455,7 @@ function get_users_in_group($groupid) {
     global $CFG;
     return get_records_sql("SELECT DISTINCT u.*
                               FROM {$CFG->prefix}user u,
-                                   {$CFG->prefix}group_members m 
+                                   {$CFG->prefix}groups_members m 
                              WHERE m.groupid = '$groupid'
                                AND m.userid = u.id");
 }
@@ -1480,8 +1480,8 @@ function user_group($courseid, $userid) {
     global $CFG;
 
     return get_record_sql("SELECT g.*
-                             FROM {$CFG->prefix}group g,
-                                  {$CFG->prefix}group_members m
+                             FROM {$CFG->prefix}groups g,
+                                  {$CFG->prefix}groups_members m
                              WHERE g.courseid = '$courseid'
                                AND g.id = m.groupid
                                AND m.userid = '$userid'");
diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index a6dd1a9695..21207583b7 100644
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -561,7 +561,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2003121600) {
-        modify_database("", "CREATE TABLE `prefix_group` (
+        modify_database("", "CREATE TABLE `prefix_groups` (
                                 `id` int(10) unsigned NOT NULL auto_increment,
                                 `courseid` int(10) unsigned NOT NULL default '0',
                                 `name` varchar(254) NOT NULL default '',
@@ -574,7 +574,7 @@ function main_upgrade($oldversion=0) {
                                 KEY `courseid` (`courseid`)
                               ) TYPE=MyISAM COMMENT='Each record is a group in a course.'; ");
 
-        modify_database("", "CREATE TABLE `prefix_group_members` (
+        modify_database("", "CREATE TABLE `prefix_groups_members` (
                                 `id` int(10) unsigned NOT NULL auto_increment,
                                 `groupid` int(10) unsigned NOT NULL default '0',
                                 `userid` int(10) unsigned NOT NULL default '0',
diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 0ecab1741a..4ca29118ed 100644
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -136,7 +136,7 @@ CREATE TABLE `prefix_course_sections` (
 # Table structure for table `group`
 #
 
-CREATE TABLE `prefix_group` (
+CREATE TABLE `prefix_groups` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `courseid` int(10) unsigned NOT NULL default '0',
   `name` varchar(254) NOT NULL default '',
@@ -154,7 +154,7 @@ CREATE TABLE `prefix_group` (
 # Table structure for table `group_members`
 #
 
-CREATE TABLE `prefix_group_members` (
+CREATE TABLE `prefix_groups_members` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `groupid` int(10) unsigned NOT NULL default '0',
   `userid` int(10) unsigned NOT NULL default '0',
diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index b60be731a5..f29a5853b2 100644
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -311,7 +311,7 @@ function main_upgrade($oldversion=0) {
 
 
     if ($oldversion < 2003121600) {
-        execute_sql("CREATE TABLE {$CFG->prefix}group (
+        execute_sql("CREATE TABLE {$CFG->prefix}groups (
                         id SERIAL PRIMARY KEY,
                         courseid integer NOT NULL default '0',
                         name varchar(255) NOT NULL default '',
@@ -322,16 +322,16 @@ function main_upgrade($oldversion=0) {
                         timemodified integer NOT NULL default '0'
                      )");
     
-        execute_sql("CREATE INDEX {$CFG->prefix}group_idx ON {$CFG->prefix}group (courseid) ");
+        execute_sql("CREATE INDEX {$CFG->prefix}groups_idx ON {$CFG->prefix}groups (courseid) ");
     
-        execute_sql("CREATE TABLE {$CFG->prefix}group_members (
+        execute_sql("CREATE TABLE {$CFG->prefix}groups_members (
                         id SERIAL PRIMARY KEY,
                         groupid integer NOT NULL default '0',
                         userid integer NOT NULL default '0',
                         timeadded integer NOT NULL default '0'
                      )");
       
-        execute_sql("CREATE INDEX {$CFG->prefix}group_members_idx ON {$CFG->prefix}group_members (groupid) ");
+        execute_sql("CREATE INDEX {$CFG->prefix}groups_members_idx ON {$CFG->prefix}groups_members (groupid) ");
     }
 
     if ($oldversion < 2003122600) {
diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 82968a0540..42a5aa5871 100644
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -79,7 +79,7 @@ CREATE TABLE prefix_course_sections (
    visible integer NOT NULL default '1'
 );
 
-CREATE TABLE prefix_group (
+CREATE TABLE prefix_groups (
    id SERIAL PRIMARY KEY,
    courseid integer NOT NULL default '0',
    name varchar(255) NOT NULL default '',
@@ -90,16 +90,16 @@ CREATE TABLE prefix_group (
    timemodified integer NOT NULL default '0'
 );
 
-CREATE INDEX prefix_group_idx ON prefix_group (courseid);
+CREATE INDEX prefix_groups_idx ON prefix_groups (courseid);
 
-CREATE TABLE prefix_group_members (
+CREATE TABLE prefix_groups_members (
    id SERIAL PRIMARY KEY,
    groupid integer NOT NULL default '0',
    userid integer NOT NULL default '0',
    timeadded integer NOT NULL default '0'
 );
 
-CREATE INDEX prefix_group_members_idx ON prefix_group_members (groupid);
+CREATE INDEX prefix_groups_members_idx ON prefix_groups_members (groupid);
 
 CREATE TABLE prefix_log (
    id SERIAL PRIMARY KEY,
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 804fadb961..77b385bdc0 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -889,7 +889,7 @@ function ismember($groupid, $userid=0) {
         return !empty($USER->groupmember[$groupid]);
     }
 
-    return record_exists("group_members", "groupid", $groupid, "userid", $userid);
+    return record_exists("groups_members", "groupid", $groupid, "userid", $userid);
 }
 
 /**
@@ -937,7 +937,7 @@ function get_current_group($courseid, $full=false) {
     }
 
     if ($full) {
-        return get_record('group', 'id', $SESSION->currentgroup[$courseid]);
+        return get_record('groups', 'id', $SESSION->currentgroup[$courseid]);
     } else {
         return $SESSION->currentgroup[$courseid];
     }