--- feedapi.install	2008-02-19 02:36:23.000000000 +0800
+++ feedapi.install	2008-02-26 16:38:41.000000000 +0800
@@ -46,17 +46,14 @@ function feedapi_install() {
         half_done smallint,
         PRIMARY KEY(nid))
       ");
-      db_query("CREATE TABLE feedapi_stat (
+      db_query("CREATE TABLE {feedapi_stat} (
         id int NOT NULL default '0',
         type VARCHAR(64) NOT NULL,
         timestamp INT NOT NULL,
         time VARCHAR(20) NOT NULL,
         value INT NOT NULL)
       ");
-      db_query("CREATE INDEX type_index on feedapi_stat(type)");
-      db_query("CREATE INDEX timestamp_index on feedapi_stat(timestamp)");
-      db_query("CREATE INDEX time_index on feedapi_stat(time)");
-      db_query("CREATE INDEX id_index on feedapi_stat(id)");
+      db_query("CREATE INDEX {feedapi_stat}_id_type_timestamp_time_idx ON {feedapi_stat} (id, type, timestamp, time)");
       break;
   }
   // This value warrants that og, taxonomy and similar modules does their job before feedapi. This is important
@@ -211,10 +208,10 @@ function feedapi_update_4() {
         time VARCHAR(20) NOT NULL,
         value INT NOT NULL)
       ");
-      db_query("CREATE INDEX type_index on feedapi_stat(type)");
-      db_query("CREATE INDEX timestamp_index on feedapi_stat(timestamp)");
-      db_query("CREATE INDEX time_index on feedapi_stat(time)");
-      db_query("CREATE INDEX id_index on feedapi_stat(id)");
+      db_query("CREATE INDEX type_index on {feedapi_stat} (type)");
+      db_query("CREATE INDEX timestamp_index on {feedapi_stat} (timestamp)");
+      db_query("CREATE INDEX time_index on {feedapi_stat} (time)");
+      db_query("CREATE INDEX id_index on {feedapi_stat} (id)");
       break;
   }
   $result = db_query("SELECT nid, statistics FROM {feedapi}");
@@ -245,3 +242,21 @@ function feedapi_update_6() {
   $ret[] = update_sql("ALTER TABLE {feedapi} ADD COLUMN hash varchar(32)");
   return $ret;  
 }
+
+function feedapi_update_7() {
+  $ret = array();
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+      break;
+    case 'pgsql':
+      db_query("DROP INDEX type_index");
+      db_query("DROP INDEX timestamp_index");
+      db_query("DROP INDEX time_index");
+      db_query("DROP INDEX id_index");
+      db_query("CREATE INDEX {feedapi_stat}_id_type_timestamp_time_idx ON {feedapi_stat} (id, type, timestamp, time)");
+      break;
+  }
+  return $ret;
+}
+