Index: spam.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/spam/Attic/spam.install,v
retrieving revision 1.1.2.1.2.9.2.19
diff -b -u -p -r1.1.2.1.2.9.2.19 spam.install
--- spam.install	20 Sep 2008 16:12:20 -0000	1.1.2.1.2.9.2.19
+++ spam.install	27 Sep 2008 04:15:21 -0000
@@ -125,96 +125,103 @@ function spam_install() {
        * The smallint type is generally only used if disk space is at a premium.
        */
       db_query("CREATE TABLE {spam_filters} (
-	fid serial PRIMARY KEY,
-	gid integer NOT NULL default 0,
-	name varchar(128) NOT NULL default '',
-	module varchar(128) NOT NULL default '',
-	status integer NOT NULL default 0,
-	weight integer NOT NULL default 0,
-	gain integer NOT NULL default 0
+        fid SERIAL,
+        gid int_unsigned NOT NULL DEFAULT 0,
+        name VARCHAR(128) NOT NULL DEFAULT '',
+        module VARCHAR(128) NOT NULL DEFAULT '',
+        status int_unsigned NOT NULL DEFAULT 0,
+        weight INTEGER NOT NULL DEFAULT 0,
+        gain int_unsigned NOT NULL DEFAULT 0,
+        PRIMARY KEY (fid)
       );");
-      db_query("CREATE INDEX {spam_filters}_gid_key ON {spam_filters} (gid);");
-      db_query("CREATE INDEX {spam_filters}_name_key ON {spam_filters} (name);");
-      db_query("CREATE INDEX {spam_filters}_module_key ON {spam_filters} (module);");
-      db_query("CREATE INDEX {spam_filters}_status_key ON {spam_filters} (status);");
-      db_query("CREATE INDEX {spam_filters}_weight_key ON {spam_filters} (weight);");
+      db_query("CREATE INDEX {spam_filters}_gid_idx ON {spam_filters} (gid);");
+      db_query("CREATE INDEX {spam_filters}_name_idx ON {spam_filters} (name);");
+      db_query("CREATE INDEX {spam_filters}_module_idx ON {spam_filters} (module);");
+      db_query("CREATE INDEX {spam_filters}_status_idx ON {spam_filters} (status);");
+      db_query("CREATE INDEX {spam_filters}_weight_idx ON {spam_filters} (weight);");
       db_query("CREATE TABLE {spam_filters_groups} (
-        gid serial PRIMARY KEY,
-	name varchar(255) NOT NULL default '',
-	weight integer NOT NULL default 0
+        gid SERIAL,
+        name VARCHAR(255) NOT NULL DEFAULT '',
+        weight INTEGER NOT NULL DEFAULT 0
       );");
-      db_query("CREATE INDEX {spam_filters_groups}_weight_key ON {spam_filters_groups} (weight);");
+      db_query("CREATE INDEX {spam_filters_groups}_weight_idx ON {spam_filters_groups} (weight);");
       db_query("CREATE TABLE {spam_filters_groups_data} (
-	gid serial,
-	content_type varchar(64) NOT NULL default '',
-	CONSTRAINT spam_filters_groups_data_pk PRIMARY KEY(gid,content_type)
+        gid SERIAL,
+        content_type VARCHAR(64) NOT NULL DEFAULT '',
+        PRIMARY KEY (gid, content_type)
       );");
-      db_query("CREATE INDEX {spam_filters_groups_data}_content_type_key ON {spam_filters_groups_data} (content_type);");
+      db_query("CREATE INDEX {spam_filters_groups_data}_content_type_idx ON {spam_filters_groups_data} (content_type);");
       /**
        * Tracks all filtered site content, included both spam and non-spam.
        */
       db_query("CREATE TABLE {spam_tracker} (
-	sid serial PRIMARY KEY,
-	content_type varchar(128) NOT NULL default '',
-	content_id integer NOT NULL default 0,
-	score integer NOT NULL default 0,
-	hostname varchar(15) NOT NULL default '',
-	timestamp integer NOT NULL default 0,
-	CONSTRAINT spam_tracker_u UNIQUE(content_id,content_type)
+        sid SERIAL,
+        content_type VARCHAR(128) NOT NULL DEFAULT '',
+        content_id int_unsigned NOT NULL DEFAULT 0,
+        score int_unsigned NOT NULL DEFAULT 0,
+        hostname VARCHAR(15) NOT NULL DEFAULT '',
+        timestamp int_unsigned NOT NULL DEFAULT 0,
+        PRIMARY KEY (sid),
+        CONSTRAINT content_id_content_type UNIQUE (content_id, content_type)
       );");
-      db_query("CREATE INDEX {spam_tracker}_u_key ON {spam_tracker} (content_id,content_type);");
-      db_query("CREATE INDEX {spam_tracker}_content_type_key ON {spam_tracker} (content_type);");
-      db_query("CREATE INDEX {spam_tracker}_score_key ON {spam_tracker} (score);");
-      db_query("CREATE INDEX {spam_tracker}_hostname_key ON {spam_tracker} (hostname);");
-      db_query("CREATE INDEX {spam_tracker}_timestamp_key ON {spam_tracker} (timestamp);");
+      db_query("CREATE INDEX {spam_tracker}_content_type_idx ON {spam_tracker} (content_type);");
+      db_query("CREATE INDEX {spam_tracker}_score_idx ON {spam_tracker} (score);");
+      db_query("CREATE INDEX {spam_tracker}_hostname_idx ON {spam_tracker} (hostname);");
+      db_query("CREATE INDEX {spam_tracker}_timestamp_idx ON {spam_tracker} (timestamp);");
       /**
        *
        */
       db_query("CREATE TABLE {spam_filters_errors} (
-	bid serial PRIMARY KEY,
-	content_type varchar(128) NOT NULL default '',
-	content_id integer NOT NULL default 0,
-	content_hash char(32) NOT NULL default '',
-        content text NOT NULL,
-        feedback text NOT NULL,
-	hostname varchar(15) NOT NULL default '',
-	timestamp integer NOT NULL default 0,
-	CONSTRAINT spam_filters_errors_u1 UNIQUE(content_id,content_type),
-	CONSTRAINT spam_filters_errors_u2 UNIQUE(content_hash)
+        bid SERIAL,
+        uid int_unsigned NOT NULL DEFAULT 0,
+        content_type VARCHAR(128) NOT NULL DEFAULT '',
+        content_id int_unsigned NOT NULL DEFAULT 0,
+        content_hash CHAR(32) NOT NULL DEFAULT '',
+        content TEXT NOT NULL,
+        feedback TEXT NOT NULL,
+        hostname VARCHAR(15) NOT NULL DEFAULT '',
+        timestamp int_unsigned NOT NULL DEFAULT 0,
+        PRIMARY KEY (bid),
+        CONSTRAINT content_hash UNIQUE (content_hash)
       );");
-      db_query("CREATE INDEX {spam_filters_errors}_content_type_key ON {spam_filters_errors} (content_type);");
-      db_query("CREATE INDEX {spam_filters_errors}_content_hash_key ON {spam_filters_errors} (content_hash);");
-      db_query("CREATE INDEX {spam_filters_errors}_hostname_key ON {spam_filters_errors} (hostname);");
-      db_query("CREATE INDEX {spam_filters_errors}_timestamp_key ON {spam_filters_errors} (timestamp);");
+      db_query("CREATE INDEX {spam_filters_errors}_content_id_content_type_idx ON {spam_filters_errors} (content_id, content_type);");
+      db_query("CREATE INDEX {spam_filters_errors}_content_type_idx ON {spam_filters_errors} (content_type);");
+      db_query("CREATE INDEX {spam_filters_errors}_hostname_idx ON {spam_filters_errors} (hostname);");
+      db_query("CREATE INDEX {spam_filters_errors}_timestamp_idx ON {spam_filters_errors} (timestamp);");
       /**
        * Logging mechanism similar to watchdog, but provides additional 
        * information specific to spam tracking.
        */
       db_query("CREATE TABLE {spam_log} (
-	lid serial PRIMARY KEY,
-        trid integer UNSIGNED NOT NULL DEFAULT '0',
-        level integer UNSIGNED NOT NULL DEFAULT '0',
-	content_type varchar(128) NOT NULL default '',
-	content_id integer NOT NULL default 0,
-	function varchar(255) NOT NULL default '',
-	uid integer NOT NULL default 0,
-	message varchar(255) NOT NULL default '',
-	timestamp integer NOT NULL default 0
+        lid SERIAL,
+        trid int_unsigned NOT NULL DEFAULT 0,
+        level int_unsigned NOT NULL DEFAULT 0,
+        content_type VARCHAR(128) NOT NULL DEFAULT '',
+        content_id INTEGER NOT NULL DEFAULT 0,
+        uid INTEGER NOT NULL DEFAULT 0,
+        function VARCHAR(255) NOT NULL DEFAULT '',
+        message VARCHAR(255) NOT NULL DEFAULT '',
+        hostname VARCHAR(15) NOT NULL DEFAULT '',
+        timestamp INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (lid)
       );");
-      db_query("CREATE INDEX {spam_log}_sid_key ON {spam_log} (sid);");
-      db_query("CREATE INDEX {spam_log}_trid_key ON {spam_log} (trid);");
+      db_query("CREATE INDEX {spam_log}_trid_idx ON {spam_log} (trid);");
+      db_query("CREATE INDEX {spam_log}_content_type_content_id_idx ON {spam_log} (content_type, content_id);");
+      db_query("CREATE INDEX {spam_log}_message_idx ON {spam_log} (message);");
+      db_query("CREATE INDEX {spam_log}_uid_idx ON {spam_log} (uid);");
+      db_query("CREATE INDEX {spam_log}_hostname_idx ON {spam_log} (hostname);");
       db_query("CREATE INDEX {spam_log}_timestamp_key ON {spam_log} (timestamp);");
       /**
        * Spam statistics.
        */
       db_query("CREATE TABLE {spam_statistics} (
-        stid serial PRIMARY KEY,
-        name varchar(64) NOT NULL DEFAULT '',
-        count integer UNSIGNED NOT NULL DEFAULT '0',
-        timestamp integer UNSIGNED DEFAULT '0',
-	CONSTRAINT spam_statistics_u UNIQUE(name)
+        stid SERIAL,
+        name VARCHAR(64) NOT NULL DEFAULT '',
+        count int_unsigned NOT NULL DEFAULT 0,
+        timestamp int_unsigned DEFAULT 0,
+        PRIMARY KEY (stid),
+        CONSTRAINT name UNIQUE (name)
       );");
-      db_query("CREATE INDEX {spam_statistics}_u_key ON {spam_statistics} (name);");
       break;
   }
 }