Index: openacs-4/packages/contacts/sql/postgresql/contacts-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/sql/postgresql/contacts-drop.sql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/contacts/sql/postgresql/contacts-drop.sql	13 Jan 2005 13:57:00 -0000	1.2
+++ openacs-4/packages/contacts/sql/postgresql/contacts-drop.sql	18 May 2005 16:45:49 -0000	1.3
@@ -6,30 +6,24 @@
 --
 --
 
+drop table contact_search_conditions;
+drop table contact_searches;
+select drop_package('contact_search');
+select acs_object__delete(search_id) from contact_searches;
+select acs_object_type__drop_type('contact_search','t');
 
--- The view structure.
-\i views-drop.sql
+drop view contact_rel_types;
+drop table contact_signatures;
+drop table contact_groups;
+drop table contact_rels;
+drop table organization_rels;
+select content_type__drop_type ('contact_party_revision','t','t');
+--drop table contact_party_revisions;
+select acs_rel_type__drop_type('organization_rel','t');
+select acs_rel_type__drop_type(object_type,'t') from acs_object_types where supertype = 'contact_rel';
+select acs_rel_type__drop_type('contact_rel','t');
 
--- The attribute structure.
-\i attributes-drop.sql
-
-
-drop view contacts;
-drop table contact_archives;
-drop table contact_object_types;
-
+-- procedure drop_type
 select drop_package('contact');
-
-delete from acs_objects where object_type = 'contact_object_type';
-create function inline_0 ()
-returns integer as '
-begin
-
-  PERFORM acs_object_type__drop_type (''contact_object_type'',''f'');
-
-  return 0;
-end;' language 'plpgsql';
-
-select inline_0 ();
-drop function inline_0 ();
-
+select drop_package('contact_rel');
+select drop_package('contact_party_revision');