Index: openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql	23 Feb 2003 18:20:31 -0000	1.3
+++ openacs-4/packages/forums/sql/postgresql/forums-forums-drop.sql	8 Aug 2006 21:26:51 -0000	1.4
@@ -13,31 +13,25 @@
 create function inline_0 ()
 returns integer as '
 begin
+
+    delete from acs_permissions where privilege in (''forum_moderate'');
+
     -- remove children
-    perform acs_privilege__remove_child(''read'',''forum_read'');
-    perform acs_privilege__remove_child(''create'',''forum_create'');
-    perform acs_privilege__remove_child(''write'',''forum_write'');
-    perform acs_privilege__remove_child(''delete'',''forum_delete'');
     perform acs_privilege__remove_child(''admin'',''forum_moderate'');
-    perform acs_privilege__remove_child(''forum_moderate'',''forum_read'');
-    perform acs_privilege__remove_child(''forum_moderate'',''forum_post'');
-    perform acs_privilege__remove_child(''forum_write'',''forum_read'');
+    perform acs_privilege__remove_child(''forum_moderate'',''create'');
+    perform acs_privilege__remove_child(''forum_moderate'',''delete'');
+    perform acs_privilege__remove_child(''forum_moderate'',''read'');
+    perform acs_privilege__remove_child(''forum_moderate'',''write'');
 
-    perform acs_privilege__remove_child(''forum_write'',''forum_post'');
-    
     perform acs_privilege__drop_privilege(''forum_moderate'');
-    perform acs_privilege__drop_privilege(''forum_post'');
-    perform acs_privilege__drop_privilege(''forum_read'');
-    perform acs_privilege__drop_privilege(''forum_create'');
-    perform acs_privilege__drop_privilege(''forum_write'');
-    perform acs_privilege__drop_privilege(''forum_delete'');
 
     return null;
 end;' language 'plpgsql';
 
 select inline_0();
 drop function inline_0 ();
 
+DROP INDEX forums_forums_pkg_enable_idx;
 drop view forums_forums_enabled;
 drop table forums_forums;