Index: cvs.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.install,v
retrieving revision 1.11
diff -u -F^f -b -r1.11 cvs.install
--- cvs.install	10 Jan 2007 09:31:02 -0000	1.11
+++ cvs.install	17 Jul 2007 15:26:01 -0000
@@ -6,12 +6,10 @@
  * Implementation of hook_install()
  */
 function cvs_install() {
-  $ret = array();
-
   switch ($GLOBALS['db_type']) {
     case 'mysqli':
     case 'mysql':
-      $ret[] = db_query("CREATE TABLE {cvs_accounts} (
+      db_query("CREATE TABLE {cvs_accounts} (
         uid int(10) unsigned NOT NULL default '0',
         name varchar(64) NOT NULL default '',
         pass varchar(64) NOT NULL default '',
@@ -22,7 +20,7 @@ function cvs_install() {
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_files} (
+      db_query("CREATE TABLE {cvs_files} (
         cid int(10) unsigned NOT NULL default '0',
         rid int(10) unsigned NOT NULL default '0',
         uid int(10) unsigned NOT NULL default '0',
@@ -41,12 +39,12 @@ function cvs_install() {
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_messages} (
+      db_query("CREATE TABLE {cvs_messages} (
         cid int(10) unsigned NOT NULL default '0',
         rid int(10) unsigned NOT NULL default '0',
         uid int(10) unsigned NOT NULL default '0',
         created int(10) unsigned NOT NULL default '0',
-        user varchar(255) NOT NULL default '',
+        username varchar(255) NOT NULL default '',
         message text,
         PRIMARY KEY (cid),
         KEY uid (uid),
@@ -55,7 +53,7 @@ function cvs_install() {
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_projects} (
+      db_query("CREATE TABLE {cvs_projects} (
         nid int(10) unsigned NOT NULL default '0',
         rid int(10) unsigned NOT NULL default '0',
         directory varchar(255) NOT NULL default '',
@@ -64,7 +62,7 @@ function cvs_install() {
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_tags} (
+      db_query("CREATE TABLE {cvs_tags} (
         nid int unsigned NOT NULL default '0',
         tag varchar(255) NOT NULL default '',
         branch tinyint unsigned NOT NULL default '0',
@@ -73,14 +71,14 @@ function cvs_install() {
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_project_maintainers} (
+      db_query("CREATE TABLE {cvs_project_maintainers} (
         nid int(10) unsigned NOT NULL default '0',
         uid int(10) unsigned NOT NULL default '0',
         PRIMARY KEY (nid, uid))
         /*!40100 DEFAULT CHARACTER SET utf8 */"
       );
 
-      $ret[] = db_query("CREATE TABLE {cvs_repositories} (
+      db_query("CREATE TABLE {cvs_repositories} (
         rid int(10) unsigned NOT NULL auto_increment,
         name varchar(255) NOT NULL default '',
         root varchar(255) NOT NULL default '',
@@ -96,11 +94,86 @@ function cvs_install() {
       );
       break;
     case 'pgsql':
+      db_query("CREATE TABLE {cvs_accounts} (
+        uid int NOT NULL default '0',
+        name varchar(64) NOT NULL default '',
+        pass varchar(64) NOT NULL default '',
+        motivation text,
+        status int NOT NULL default '0',
+        PRIMARY KEY (name))"
+      );
+      db_query("CREATE INDEX {cvs_accounts}_uid_idx ON {cvs_accounts} (uid)");
+
+      db_query("CREATE TABLE {cvs_files} (
+        cid int NOT NULL default '0',
+        rid int NOT NULL default '0',
+        uid int NOT NULL default '0',
+        nid int NOT NULL default '0',
+        file varchar(255) NOT NULL default '',
+        branch varchar(255) NOT NULL default '',
+        revision varchar(255) NOT NULL default '',
+        lines_added int NOT NULL default '0',
+        lines_removed int NOT NULL default '0')"
+      );
+      db_query("CREATE INDEX {cvs_files}_cid_idx ON {cvs_files} (cid)");
+      db_query("CREATE INDEX {cvs_files}_nid_idx ON {cvs_files} (nid)");
+      db_query("CREATE INDEX {cvs_files}_rid_idx ON {cvs_files} (rid)");
+      db_query("CREATE INDEX {cvs_files}_uid_idx ON {cvs_files} (uid)");
+      db_query("CREATE INDEX {cvs_files}_file_idx ON {cvs_files} (file)");
+      db_query("CREATE INDEX {cvs_files}_branch_idx ON {cvs_files} (branch)");
+
+      db_query("CREATE TABLE {cvs_messages} (
+        cid int NOT NULL default '0',
+        rid int NOT NULL default '0',
+        uid int NOT NULL default '0',
+        created int NOT NULL default '0',
+        username varchar(255) NOT NULL default '',
+        message text,
+        PRIMARY KEY (cid))"
+      );
+      db_query("CREATE INDEX {cvs_messages}_uid_idx ON {cvs_messages} (uid)");
+      db_query("CREATE INDEX {cvs_messages}_created_idx ON {cvs_messages} (created)");
+      db_query("CREATE INDEX {cvs_messages}_rid_idx ON {cvs_messages} (rid)");
+
+      db_query("CREATE TABLE {cvs_projects} (
+        nid int NOT NULL default '0',
+        rid int NOT NULL default '0',
+        directory varchar(255) NOT NULL default '',
+        PRIMARY KEY (nid))"
+      );
+      db_query("CREATE INDEX {cvs_projects}_directory_idx ON {cvs_projects} (directory)");
+
+      db_query("CREATE TABLE {cvs_tags} (
+        nid int NOT NULL default '0',
+        tag varchar(255) NOT NULL default '',
+        branch smallint NOT NULL default '0',
+        PRIMARY KEY (nid, tag))"
+      );
+      db_query("CREATE INDEX {cvs_tags}_tag_idx ON {cvs_tags} (tag)");
+
+      db_query("CREATE TABLE {cvs_project_maintainers} (
+        nid int NOT NULL default '0',
+        uid int NOT NULL default '0',
+        PRIMARY KEY (nid, uid))"
+      );
+
+      db_query("CREATE TABLE {cvs_repositories} (
+        rid serial,
+        name varchar(255) NOT NULL default '',
+        root varchar(255) NOT NULL default '',
+        modules varchar(255) NOT NULL default '',
+        diffurl varchar(255) NOT NULL default '',
+        newurl varchar(255) NOT NULL default '',
+        trackerurl varchar(255) NOT NULL default '',
+        method smallint NOT NULL default '0',
+        updated int NOT NULL default '0',
+        PRIMARY KEY (rid),
+        UNIQUE (name))"
+      );
       break;
   }
 
-  $ret[] = db_query("UPDATE {system} SET weight = 3 WHERE name = 'cvs'");
-  return $ret;
+  db_query("UPDATE {system} SET weight = 3 WHERE name = 'cvs'");
 }
 
 function cvs_update_1() {
@@ -178,3 +251,61 @@ function cvs_update_6() {
   variable_del('cvs_allow_repo_selection');
   return $ret;
 }
+
+function cvs_update_7() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      $ret[] = update_sql("ALTER TABLE {cvs_messages} CHANGE user username varchar(255) NOT NULL default ''");
+      break;
+  }
+  return $ret;
+}
+
+function cvs_uninstall() {
+
+  // Drop tables.
+  $tables = array(
+    'cvs_accounts',
+    'cvs_files',
+    'cvs_messages',
+    'cvs_projects',
+    'cvs_tags',
+    'cvs_project_maintainers',
+    'cvs_repositories',
+  );
+  foreach ($tables as $table) {
+  	if (db_table_exists($table)) {
+  	  db_query("DROP TABLE {%s}", $table);
+  	}
+  }
+
+  // Remove variables.
+  $variables = array(
+    'cvs_email_address',
+    'cvs_use_file',
+    'cvs_default_repo',
+    'cvs_restrict_project_creation',
+    'cvs_directory_validate_by_type',
+    'cvs_validate_by_short_name',
+    'cvs_directory_validate_dir_root_by_case',
+    'cvs_list_per_page',
+    'cvs_message_anon',
+    'cvs_message_auth',
+    'cvs_motivation_description',
+    'cvs_received_email',
+    'cvs_new_application_email',
+    'cvs_approved_email',
+    'cvs_pending_email',
+    'cvs_declined_email',
+    'cvs_disabled_email',
+    'cvs_message_new_release_branch',
+    'cvs_message_new_release_tag',
+    'cvs_pager',
+  );
+  foreach ($variables as $variable) {
+    variable_del($variable);
+  }
+  db_query("DELETE FROM {variable} WHERE name LIKE 'cvs_directory_tid_%'");
+}
Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.155
diff -u -F^f -b -r1.155 cvs.module
--- cvs.module	13 Jul 2007 06:39:23 -0000	1.155
+++ cvs.module	17 Jul 2007 15:26:02 -0000
@@ -692,7 +692,7 @@ function cvs_user_edit_form_submit($form
     else {
       db_query("UPDATE {cvs_accounts} SET name = '%s', status = %d WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_status'], $form_values['cvs_uid']);
     }
-    db_query("UPDATE {cvs_messages} SET user = '%s' WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_uid']);
+    db_query("UPDATE {cvs_messages} SET username = '%s' WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_uid']);
     if ($form_values['send_mail']) {
       cvs_mail_user($form_values['cvs_uid'], $form_values['message']);
     }
@@ -1214,7 +1214,7 @@ function cvs_show_messages() {
     $attributes['commit'] = $_REQUEST['commit'];
   }
   if ($_REQUEST['user']) {
-    $where[] = "m.user = '". db_escape_string($_REQUEST['user']) ."' OR u.name = '". db_escape_string($_REQUEST['user']) ."'";
+    $where[] = "m.username = '". db_escape_string($_REQUEST['user']) ."' OR u.name = '". db_escape_string($_REQUEST['user']) ."'";
     $attributes['user'] = $_REQUEST['user'];
   }
   if (is_numeric($_REQUEST['uid'])) {
@@ -2013,7 +2013,7 @@ function cvs_process_log(&$logs, $path, 
           }
           else {
             $entry->cid = db_next_id('{cvs_messages}_cid');
-            db_query("INSERT INTO {cvs_messages} (cid, rid, uid, created, user, message) VALUES (%d, %d, %d, %d, '%s', '%s')", $entry->cid, $repo->rid, $uid, $entry->date, $entry->user, $entry->comment);
+            db_query("INSERT INTO {cvs_messages} (cid, rid, uid, created, username, message) VALUES (%d, %d, %d, %d, '%s', '%s')", $entry->cid, $repo->rid, $uid, $entry->date, $entry->user, $entry->comment);
           }
 
           $result = db_query("SELECT cid FROM {cvs_files} WHERE cid = %d AND file = '%s' AND revision = '%s'", $entry->cid, $log->file, $entry->revision);
@@ -2264,10 +2264,10 @@ function _cvs_import_existing_accounts()
   
   print "updating {cvs_messages}-table ...<br />";
   db_query('DELETE FROM {cvs_accounts}');
-  $result = db_query('SELECT DISTINCT(c.user) AS name, u.uid FROM {cvs_messages} c INNER JOIN {users} u ON c.user = u.name GROUP BY c.name ORDER BY c.created ASC');
+  $result = db_query('SELECT DISTINCT(c.username) AS name, u.uid FROM {cvs_messages} c INNER JOIN {users} u ON c.username = u.name GROUP BY c.name ORDER BY c.created ASC');
   while ($user = db_fetch_object($result)) {
     db_query("INSERT INTO {cvs_accounts} (uid, name) VALUES (%d, '%s')", $user->uid, $user->name);
-    db_query("UPDATE {cvs_messages} SET uid = %d WHERE user = '%s'", $user->uid, $user->name);
+    db_query("UPDATE {cvs_messages} SET uid = %d WHERE username = '%s'", $user->uid, $user->name);
   }
  
   print "updating {cvs_files}-table ...<br />";
@@ -2286,7 +2286,7 @@ function _cvs_update_authors() {
   db_query("UPDATE {cvs_messages} SET uid = 0");
   $result = db_query('SELECT * FROM {cvs_accounts}');
   while ($user = db_fetch_object($result)) {
-    db_query("UPDATE {cvs_messages} SET uid = %d WHERE user = '%s'", $user->uid, $user->name);
+    db_query("UPDATE {cvs_messages} SET uid = %d WHERE username = '%s'", $user->uid, $user->name);
   }
   
   print "updating {cvs_files}-table ...<br />";