Index: modules/forum/forum.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.install,v
retrieving revision 1.6
diff -u -p -r1.6 forum.install
--- modules/forum/forum.install	1 Sep 2006 07:40:08 -0000	1.6
+++ modules/forum/forum.install	9 Jan 2007 20:53:55 -0000
@@ -35,7 +35,7 @@ function forum_install() {
  */
 function forum_uninstall() {
   db_query('DROP TABLE {forum}');
-  db_query("DELETE FROM {node} WHERE type = 'forum'");
+  db_query("DELETE FROM {node_type} WHERE type = 'poll'");
   variable_del('forum_containers');
   variable_del('forum_nav_vocabulary');
   variable_del('forum_hot_topic');
@@ -43,4 +43,17 @@ function forum_uninstall() {
   variable_del('forum_order');
   variable_del('forum_block_num_0');
   variable_del('forum_block_num_1');
+
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("DELETE {node}, {node_revisions} FROM {node}, {node_revisions} WHERE {node}.nid = {node_revisions}.nid AND {node}.type = 'forum'");
+      break;
+    case 'pgsql':
+      db_query("DELETE FROM {node_revisions} USING {node} WHERE {node}.nid = {node_revisions}.nid AND {node}.type = 'forum'");
+      db_query("DELETE FROM {node} WHERE {node}.type = 'forum'");
+      break;
+  }
+
 }
Index: modules/poll/poll.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v
retrieving revision 1.7
diff -u -p -r1.7 poll.install
--- modules/poll/poll.install	1 Sep 2006 07:40:08 -0000	1.7
+++ modules/poll/poll.install	9 Jan 2007 20:53:55 -0000
@@ -74,4 +74,16 @@ function poll_uninstall() {
   db_query('DROP TABLE {poll}');
   db_query('DROP TABLE {poll_votes}');
   db_query('DROP TABLE {poll_choices}');
+  db_query("DELETE FROM {node_type} WHERE type = 'poll'");
+
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("DELETE {node}, {node_revisions} FROM {node}, {node_revisions} WHERE {node}.nid = {node_revisions}.nid AND {node}.type = 'poll'");
+      break;
+    case 'pgsql':
+      db_query("DELETE FROM {node_revisions} USING {node} WHERE {node}.nid = {node_revisions}.nid AND {node}.type = 'poll'");
+      db_query("DELETE FROM {node} WHERE {node}.type = 'poll'");
+      break;
+  }
 }