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 15 Jul 2007 02:13:06 -0000
@@ -46,7 +46,7 @@ function cvs_install() {
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 '',
+ t_user varchar(255) NOT NULL default '',
message text,
PRIMARY KEY (cid),
KEY uid (uid),
@@ -96,6 +96,82 @@ function cvs_install() {
);
break;
case 'pgsql':
+ $ret[] = 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))"
+ );
+ $ret[] = db_query("CREATE INDEX {cvs_accounts}_uid_idx ON {cvs_accounts} (uid)");
+
+ $ret[] = 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')"
+ );
+ $ret[] = db_query("CREATE INDEX {cvs_files}_cid_idx ON {cvs_files} (cid)");
+ $ret[] = db_query("CREATE INDEX {cvs_files}_nid_idx ON {cvs_files} (nid)");
+ $ret[] = db_query("CREATE INDEX {cvs_files}_rid_idx ON {cvs_files} (rid)");
+ $ret[] = db_query("CREATE INDEX {cvs_files}_uid_idx ON {cvs_files} (uid)");
+ $ret[] = db_query("CREATE INDEX {cvs_files}_file_idx ON {cvs_files} (file)");
+ $ret[] = db_query("CREATE INDEX {cvs_files}_branch_idx ON {cvs_files} (branch)");
+
+ $ret[] = 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',
+ t_user varchar(255) NOT NULL default '',
+ message text,
+ PRIMARY KEY (cid))"
+ );
+ $ret[] = db_query("CREATE INDEX {cvs_messages}_uid_idx ON {cvs_messages} (uid)");
+ $ret[] = db_query("CREATE INDEX {cvs_messages}_created_idx ON {cvs_messages} (created)");
+ $ret[] = db_query("CREATE INDEX {cvs_messages}_rid_idx ON {cvs_messages} (rid)");
+
+ $ret[] = 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))"
+ );
+ $ret[] = db_query("CREATE INDEX {cvs_projects}_directory_idx ON {cvs_projects} (directory)");
+
+ $ret[] = 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))"
+ );
+ $ret[] = db_query("CREATE INDEX {cvs_tags}_tag_idx ON {cvs_tags} (tag)");
+
+ $ret[] = db_query("CREATE TABLE {cvs_project_maintainers} (
+ nid int NOT NULL default '0',
+ uid int NOT NULL default '0',
+ PRIMARY KEY (nid, uid))"
+ );
+
+ $ret[] = 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;
}
@@ -178,3 +254,57 @@ 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 t_user varchar(255) NOT NULL default ''");
+ case 'pgsql':
+ 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.
+ db_query("DELETE FROM {variable} WHERE name LIKE 'cvs_directory_tid_%'");
+ variable_del('cvs_email_address');
+ variable_del('cvs_use_file');
+ variable_del('cvs_default_repo');
+ variable_del('cvs_restrict_project_creation');
+ variable_del('cvs_directory_validate_by_type');
+ variable_del('cvs_validate_by_short_name');
+ variable_del('cvs_directory_validate_dir_root_by_case');
+ variable_del('cvs_list_per_page');
+ variable_del('cvs_message_anon');
+ variable_del('cvs_message_auth');
+ variable_del('cvs_motivation_description');
+ variable_del('cvs_received_email');
+ variable_del('cvs_new_application_email');
+ variable_del('cvs_approved_email');
+ variable_del('cvs_pending_email');
+ variable_del('cvs_declined_email');
+ variable_del('cvs_disabled_email');
+ variable_del('cvs_message_new_release_branch');
+ variable_del('cvs_message_new_release_tag');
+ variable_del('cvs_pager');
+}
Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.153
diff -u -F^f -b -r1.153 cvs.module
--- cvs.module 19 Jun 2007 23:27:24 -0000 1.153
+++ cvs.module 15 Jul 2007 02:13:07 -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 t_user = '%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']);
}
@@ -1199,7 +1199,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.t_user = '". db_escape_string($_REQUEST['user']) ."' OR u.name = '". db_escape_string($_REQUEST['user']) ."'";
$attributes['user'] = $_REQUEST['user'];
}
if (is_numeric($_REQUEST['uid'])) {
@@ -1998,7 +1998,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, t_user, 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);
@@ -2249,10 +2249,10 @@ function _cvs_import_existing_accounts()
print "updating {cvs_messages}-table ...
";
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.t_user) AS name, u.uid FROM {cvs_messages} c INNER JOIN {users} u ON c.t_user = 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 t_user = '%s'", $user->uid, $user->name);
}
print "updating {cvs_files}-table ...
";
@@ -2271,7 +2271,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 t_user = '%s'", $user->uid, $user->name);
}
print "updating {cvs_files}-table ...
";