Index: openacs-4/packages/calendar/sql/postgresql/cal-item-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/cal-item-drop.sql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/sql/postgresql/cal-item-drop.sql	5 Sep 2001 09:44:59 -0000	1.2
+++ openacs-4/packages/calendar/sql/postgresql/cal-item-drop.sql	27 Sep 2001 04:12:20 -0000	1.3
@@ -34,11 +34,12 @@
 
 drop function cal_item__on_which_calendar (integer);
 
+drop table cal_items;
 --drop objects
 delete from acs_objects where object_type='cal_item';
 
 --drop table
-drop table cal_items;
+--drop table cal_items;
 
 
   -- drop attributes and acs_object_type
Index: openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql	17 Sep 2001 13:38:09 -0000	1.4
+++ openacs-4/packages/calendar/sql/postgresql/calendar-drop.sql	27 Sep 2001 04:12:20 -0000	1.5
@@ -112,11 +112,13 @@
 -- Drop Calendar
 ------------------------------------------------
 
+DROP TABLE calendars;
 CREATE FUNCTION inline_0 ()
 RETURNS integer
 AS 'begin
 	PERFORM acs_attribute__drop_attribute (''calendar'',''owner_id'');
 	PERFORM acs_attribute__drop_attribute (''calendar'',''private_p'');
+	DELETE FROM acs_objects WHERE object_type = ''calendar'';
 	PERFORM acs_object_type__drop_type (''calendar'', ''f'');
 
 	return 0;
@@ -190,7 +192,7 @@
 );
 
   -- drop table  
-drop table calendars;
+--drop table calendars;