--- spam.install.orig	2007-10-17 18:12:10.000000000 +0200
+++ spam.install	2007-12-12 05:00:15.797646479 +0100
@@ -91,11 +91,11 @@
         hash char(32) NOT NULL default '',
         timestamp integer default 0
       );");
-      db_query("CREATE INDEX {spam_tracker}_id|_key ON {spam_tracker} (id);");
-      db_query("CREATE INDEX {spam_tracker}_probability_key| ON {spam_tracker} (probability);");
-      db_query("CREATE INDEX {spam_tracker}_source_key| ON {spam_tracker} (source);");
-      db_query("CREATE INDEX {spam_tracker}_hostname_key} ON {spam_tracker} (hostname);");
-      db_query("CREATE INDEX {spam_tracker}_hash_key} ON {spam_tracker} (hash);");
+      db_query("CREATE INDEX {spam_tracker}_id_key ON {spam_tracker} (id)");
+      db_query("CREATE INDEX {spam_tracker}_probability_key ON {spam_tracker} (probability)");
+      db_query("CREATE INDEX {spam_tracker}_source_key ON {spam_tracker} (source)");
+      db_query("CREATE INDEX {spam_tracker}_hostname_key ON {spam_tracker} (hostname)");
+      db_query("CREATE INDEX {spam_tracker}_hash_key ON {spam_tracker} (hash)");
       db_query("CREATE TABLE {spam_tokens} (
         tid serial PRIMARY KEY,
         token varchar(255) NOT NULL default '',
@@ -104,11 +104,11 @@
         probability integer DEFAULT 1 CONSTRAINT {spam_tokens_probability_positive} CHECK (probability > 0),
         last integer DEFAULT 0
       );");
-      db_query("CREATE UNIQUE INDEX (spam_tokens_token_key) ON {spam_tokens} (token);");
-      db_query("CREATE INDEX (spam_tokens_spam_key) ON {spam_tokens} (spam);");
-      db_query("CREATE INDEX (spam_tokens_notspam_key) ON {spam_tokens} (notspam);");
-      db_query("CREATE INDEX (spam_tokens_probability_key} ON {spam_tokens} (probability);");
-      db_query("CREATE INDEX spam_tokens_last_key ON {spam_tokens} (last);");
+      db_query("CREATE UNIQUE INDEX {spam_tokens}_token_key ON {spam_tokens} (token)");
+      db_query("CREATE INDEX {spam_tokens}_spam_key ON {spam_tokens} (spam)");
+      db_query("CREATE INDEX (spam_tokens}_notspam_key ON {spam_tokens} (notspam)");
+      db_query("CREATE INDEX (spam_tokens}_probability_key ON {spam_tokens} (probability)");
+      db_query("CREATE INDEX {spam_tokens}_last_key ON {spam_tokens} (last)");
       db_query("CREATE TABLE {spam_custom} (
         scid serial PRIMARY KEY,
         filter varchar(255) NOT NULL default '',
@@ -118,9 +118,9 @@
         matches integer default 0,
         last integer default 0
       );");
-      db_query("CREATE INDEX {spam_custom_filter_key} ON {spam_custom} (filter);");
-      db_query("CREATE INDEX {spam_custom_matches_key} ON {spam_custom} (matches);");
-      db_query("CREATE INDEX {spam_custom_last_key} ON {spam_custom} (last);");
+      db_query("CREATE INDEX {spam_custom}_filter_key ON {spam_custom} (filter)");
+      db_query("CREATE INDEX {spam_custom}_matches_key ON {spam_custom} (matches)");
+      db_query("CREATE INDEX {spam_custom}_last_key ON {spam_custom} (last)");
 
       db_query("INSERT INTO {spam_custom} VALUES (1, '/(adipex|cialis|phentermine|viagra)/i', 1, 1, 2, 0, 0);");
       db_query("INSERT INTO {spam_custom} VALUES (2, '/casino games|poker online|texas hold''em|texas holdem/i', 1, 0, 2, 0, 0);");
@@ -144,9 +144,9 @@
         entry varchar(255) NOT NULL default '',
         timestamp integer default 0
       );");
-      db_query("CREATE INDEX {spam_log_source_key} ON {spam_log} (source);");
-      db_query("CREATE INDEX {spam_log_id_key} ON {spam_log} (id);");
-      db_query("CREATE INDEX {spam_log_timestamp_key} ON {spam_log} (timestamp);");
+      db_query("CREATE INDEX {spam_log}_source_key ON {spam_log} (source)");
+      db_query("CREATE INDEX {spam_log}_id_key ON {spam_log} (id)");
+      db_query("CREATE INDEX {spam_log}_timestamp_key ON {spam_log} (timestamp)");
   }
   drupal_set_message(t('All tables required by the spam module have been created.'));
 }