Index: parser_common_syndication/parser_common_syndication.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/parser_common_syndication/Attic/parser_common_syndication.install,v
retrieving revision 1.1.2.6
diff -u -r1.1.2.6 parser_common_syndication.install
--- parser_common_syndication/parser_common_syndication.install	29 Apr 2008 10:19:14 -0000	1.1.2.6
+++ parser_common_syndication/parser_common_syndication.install	10 Jun 2008 22:02:13 -0000
@@ -11,15 +11,15 @@
       db_query("CREATE TABLE {parser_common_syndication} (
         url varchar(255) NOT NULL default '',
         etag TEXT,
-        last_modified TEXT)
-      "); 
+        last_modified TEXT
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); 
       break;
     case 'pgsql':
       db_query("CREATE TABLE {parser_common_syndication} (
         url varchar(255) NOT NULL default '',
         etag TEXT,
-        last_modified TEXT)
-      ");
+        last_modified TEXT
+      )");
       break;
   }
   // Set the parser of defaultly shipped processors if it's not done previously
@@ -59,18 +59,18 @@
   switch ($GLOBALS['db_type']) {
     case 'mysqli':
     case 'mysql':
-      $ret[] = update_sql("CREATE TABLE if not exists {parser_common_syndication} (
+      $ret[] = update_sql("CREATE TABLE {parser_common_syndication} (
         url varchar(255) NOT NULL default '',
         etag TEXT,
-        last_modified TEXT)
-      "); 
+        last_modified TEXT
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); 
       break;
     case 'pgsql':
       $ret[] = update_sql("CREATE TABLE {parser_common_syndication} (
         url varchar(255) NOT NULL default '',
         etag TEXT,
-        last_modified TEXT)
-      ");
+        last_modified TEXT
+      )");
       break;
   }
   return $ret;
Index: feedapi.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi.install,v
retrieving revision 1.5.2.29
diff -u -r1.5.2.29 feedapi.install
--- feedapi.install	3 May 2008 16:34:51 -0000	1.5.2.29
+++ feedapi.install	10 Jun 2008 22:02:12 -0000
@@ -8,7 +8,7 @@
   switch ($GLOBALS['db_type']) {
     case 'mysqli':
     case 'mysql':
-      db_query("CREATE TABLE if not exists {feedapi} (
+      db_query("CREATE TABLE {feedapi} (
         nid int(10) unsigned NOT NULL default '0',
         url text,
         feed_type varchar(50) NOT NULL default '',
@@ -20,17 +20,17 @@
         settings longtext,
         half_done tinyint,
         skip tinyint(1) NOT NULL default '0',
-        KEY(skip),
-        PRIMARY KEY(nid))
-      "); 
+        KEY (skip),
+        PRIMARY KEY (nid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ "); 
       db_query("CREATE TABLE {feedapi_stat} (
         id INT(10) unsigned NOT NULL default '0',
         type VARCHAR(64) NOT NULL,
         timestamp INT(11) NOT NULL,
         time VARCHAR(20) NOT NULL,
         value INT(11) NOT NULL,
-        INDEX (id, type, timestamp, time));
-      ");
+        INDEX (id, type, timestamp, time)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       break;
     case 'pgsql':
       db_query("CREATE TABLE {feedapi} (
@@ -46,15 +46,15 @@
         settings text,
         half_done smallint,
         skip smallint NOT NULL default '0',
-        PRIMARY KEY(nid))
-      ");
+        PRIMARY KEY (nid)
+      )");
       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)
-      ");
+        value INT NOT NULL
+      )");
       db_query("CREATE INDEX {feedapi_stat}_id_type_timestamp_time_idx ON {feedapi_stat} (id, type, timestamp, time)");
       db_query("CREATE INDEX {feedapi}_skip_idx ON {feedapi} (skip)");
       break;
@@ -200,21 +200,21 @@
         timestamp INT(11) NOT NULL,
         time VARCHAR(20) NOT NULL,
         value INT(11) NOT NULL,
-        INDEX (type, timestamp, time));
-      ");
+        INDEX (type, timestamp, time)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       break;
     case 'pgsql':
-      $ret[] = update_sql("CREATE TABLE feedapi_stat (
+      $ret[] = update_sql("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)
-      ");
-      $ret[] = update_sql("CREATE INDEX type_index on feedapi_stat(type)");
-      $ret[] = update_sql("CREATE INDEX timestamp_index on feedapi_stat(timestamp)");
-      $ret[] = update_sql("CREATE INDEX time_index on feedapi_stat(time)");
-      $ret[] = update_sql("CREATE INDEX id_index on feedapi_stat(id)");
+        value INT NOT NULL
+      )");
+      $ret[] = update_sql("CREATE INDEX type_index on {feedapi_stat}(type)");
+      $ret[] = update_sql("CREATE INDEX timestamp_index on {feedapi_stat}(timestamp)");
+      $ret[] = update_sql("CREATE INDEX time_index on {feedapi_stat}(time)");
+      $ret[] = update_sql("CREATE INDEX id_index on {feedapi_stat}(id)");
       break;
   }
   $result = db_query("SELECT nid, statistics FROM {feedapi}");
@@ -275,11 +275,11 @@
     case 'mysqli':
     case 'mysql':
       $ret[] = update_sql("ALTER TABLE {feedapi} ADD skip TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER half_done");
-      $ret[] = update_sql("ALTER TABLE {feedapi} ADD INDEX ( skip ) ;");
+      $ret[] = update_sql("ALTER TABLE {feedapi} ADD INDEX (skip) ;");
       break;
     case 'pgsql':
       db_add_column($ret, 'feedapi', 'skip', 'smallint', array('not null' => TRUE, 'default' => 0));
-      $ret[] = update_sql("CREATE INDEX {feedapi}_skip_idx ON {feedapi} (skip)");
+      $ret[] = update_sql("CREATE INDEX {feedapi}_skip_idx ON {feedapi}(skip)");
       break;
   }
   return $ret;
Index: feedapi_node/feedapi_node.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/feedapi/feedapi_node/Attic/feedapi_node.install,v
retrieving revision 1.1.2.16
diff -u -r1.1.2.16 feedapi_node.install
--- feedapi_node/feedapi_node.install	29 Apr 2008 10:19:14 -0000	1.1.2.16
+++ feedapi_node/feedapi_node.install	10 Jun 2008 22:02:13 -0000
@@ -12,20 +12,18 @@
         `timestamp` int(10) unsigned NOT NULL default '0',
         arrived int(10) unsigned NOT NULL default '0',
         guid text character set latin1 collate latin1_general_ci NOT NULL,
-        PRIMARY KEY  (nid),
+        PRIMARY KEY (nid),
         KEY arrived (arrived),
         KEY url (url(255)),
         KEY guid (guid(255))
-        ) DEFAULT CHARSET=latin1;
-      ");
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       db_query("CREATE TABLE {feedapi_node_item_feed} (
         `feed_nid` int(10) unsigned NOT NULL default '0',
         `feed_item_nid` int(10) unsigned NOT NULL default '0',
-        PRIMARY KEY  (`feed_nid`,`feed_item_nid`),
+        PRIMARY KEY (`feed_nid`,`feed_item_nid`),
         KEY `feed_nid` (`feed_nid`),
         KEY `feed_item_nid` (`feed_item_nid`)
-        ) DEFAULT CHARSET=latin1;
-      ");
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       break;
     case 'pgsql':
       db_query("CREATE TABLE {feedapi_node_item} (
@@ -34,16 +32,17 @@
         timestamp integer not null,
         arrived integer not null,
         guid text NOT NULL default '',
-        PRIMARY KEY(nid))
-      ");
+        PRIMARY KEY (nid)
+      )");
       db_query("CREATE INDEX {feedapi_node_item}_arrived_idx ON {feedapi_node_item} (arrived)");
       db_query("CREATE INDEX url_index on {feedapi_node_item}(url)");
       db_query("CREATE INDEX guid_index on {feedapi_node_item}(guid)");
+      
       db_query("CREATE TABLE {feedapi_node_item_feed} (
         feed_nid integer NOT NULL default '0',
         feed_item_nid integer NOT NULL default '0',
-        PRIMARY KEY  (feed_nid,feed_item_nid))
-      ");
+        PRIMARY KEY (feed_nid, feed_item_nid)
+      )");
       db_query("CREATE INDEX feed_nid_index on {feedapi_node_item_feed}(feed_nid)");
       db_query("CREATE INDEX feed_item_nid_index on {feedapi_node_item_feed}(feed_item_nid)");
       break;
@@ -68,6 +67,20 @@
   variable_set('feedapi_settings_feedapi_node', $preset);
 }
 
+function feedapi_node_uninstall() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysqli':
+    case 'mysql':
+    case 'pgsql':
+      db_query("DROP TABLE {feedapi_node_item}");
+      db_query("DROP TABLE {feedapi_node_item_feed}");
+      break;
+  }
+  node_type_delete('feedapi_node');
+  variable_del('feedapi_settings_feedapi_node');
+  menu_rebuild();
+}
+
 /**
  * Fix columns indeces.
  */
@@ -130,11 +143,10 @@
       $ret[] = update_sql("CREATE TABLE IF NOT EXISTS {feedapi_node_item_feed} (
         `feed_nid` int(10) unsigned NOT NULL default '0',
         `feed_item_nid` int(10) unsigned NOT NULL default '0',
-        PRIMARY KEY  (`feed_nid`,`feed_item_nid`),
+        PRIMARY KEY (`feed_nid`,`feed_item_nid`),
         KEY `feed_nid` (`feed_nid`),
         KEY `feed_item_nid` (`feed_item_nid`)
-        ) DEFAULT CHARSET=latin1;
-      ");
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
       $ret[] = update_sql("REPLACE INTO {feedapi_node_item_feed} (feed_nid, feed_item_nid) SELECT feed_nid, nid FROM {feedapi_node_item}");
       $ret[] = update_sql("ALTER TABLE {feedapi_node_item} DROP `feed_nid`");
       break;
@@ -142,8 +154,8 @@
       $ret[] = update_sql("CREATE TABLE {feedapi_node_item_feed} (
         feed_nid integer NOT NULL default '0',
         feed_item_nid integer NOT NULL default '0',
-        PRIMARY KEY  (feed_nid,feed_item_nid))
-      ");
+        PRIMARY KEY (feed_nid, feed_item_nid)
+      )");
       $ret[] = update_sql("CREATE INDEX feed_item_nid_index on {feedapi_node_item_feed}(feed_item_nid)");
       $ret[] = update_sql("INSERT INTO {feedapi_node_item_feed} (feed_nid, feed_item_nid) SELECT feed_nid, nid FROM {feedapi_node_item}");
       $ret[] = update_sql("ALTER TABLE {feedapi_node_item} DROP feed_nid");
@@ -176,17 +188,3 @@
   }
   return $ret;
 }
-
-function feedapi_node_uninstall() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-    case 'pgsql':
-      db_query("DROP TABLE {feedapi_node_item}");
-      db_query("DROP TABLE {feedapi_node_item_feed}");
-      break;
-  }
-  node_type_delete('feedapi_node');
-  variable_del('feedapi_settings_feedapi_node');
-  menu_rebuild();
-}