Index: openacs-4/packages/chat/sql/postgresql/chat-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/sql/postgresql/chat-drop.sql,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/chat/sql/postgresql/chat-drop.sql 26 Feb 2019 18:06:43 -0000 1.5.2.1 +++ openacs-4/packages/chat/sql/postgresql/chat-drop.sql 26 Feb 2019 18:26:04 -0000 1.5.2.2 @@ -17,20 +17,17 @@ ) RETURNS integer AS $$ DECLARE - object_rec record; + object_rec record; BEGIN + for object_rec in select object_id from acs_objects where object_type='chat_transcript' + loop + PERFORM acs_object__delete( object_rec.object_id ); + end loop; - for object_rec in select object_id from acs_objects where object_type='chat_transcript' - loop - PERFORM acs_object__delete( object_rec.object_id ); - end loop; - - for object_rec in select object_id from acs_objects where object_type='chat_room' - loop - PERFORM acs_object__delete( object_rec.object_id ); - end loop; - - + for object_rec in select object_id from acs_objects where object_type='chat_room' + loop + PERFORM acs_object__delete( object_rec.object_id ); + end loop; return 0; END; $$ LANGUAGE plpgsql; @@ -42,10 +39,6 @@ -- -- Drop chat_room object type -- - - - - select acs_object_type__drop_type('chat_room','t'); select acs_object_type__drop_type('chat_transcript','t'); @@ -63,7 +56,6 @@ -- -- Drop all chat privileges -- - CREATE OR REPLACE FUNCTION inline_0 () RETURNS integer AS $$ BEGIN @@ -96,8 +88,6 @@ -- remove Site wite admin also administrator of the chat room PERFORM acs_privilege__remove_child('admin', 'chat_room_admin'); - - PERFORM acs_privilege__drop_privilege('chat_room_create'); PERFORM acs_privilege__drop_privilege('chat_room_view'); PERFORM acs_privilege__drop_privilege('chat_room_edit'); @@ -121,7 +111,6 @@ PERFORM acs_privilege__drop_privilege('chat_user'); PERFORM acs_privilege__drop_privilege('chat_avatar_allow'); - return 0; END; $$ LANGUAGE plpgsql;