Index: openacs-4/contrib/packages/events/sql/postgresql/events-activities-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/sql/postgresql/events-activities-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/events/sql/postgresql/events-activities-package-create.sql 9 Mar 2003 12:07:30 -0000 1.1 +++ openacs-4/contrib/packages/events/sql/postgresql/events-activities-package-create.sql 22 Jan 2005 20:50:29 -0000 1.2 @@ -76,20 +76,20 @@ returns integer as ' declare p_activity_id alias for $1; + v_activity_events RECORD; begin - cursor v_activity_events is - select event_id as v_event_id from acs_events - where activity_id = p_activity_id; - begin -- find and delete event instances - for row in v_activity_events loop - events_event__delete(v_event_id); - end loop; - delete from events_def_actvty_attr_map where activity_id = p_activity_id; - delete from events_org_role_activity_map where activity_id = p_activity_id; - delete from events_activities where activity_id = p_activity_id; + FOR v_activity_events IN + select event_id from acs_events + where activity_id = p_activity_id + LOOP + PERFORM events_event__delete(v_activity_events.event_id); + END LOOP; + delete from events_def_actvty_attr_map where activity_id = p_activity_id; + delete from events_org_role_activity_map where activity_id = p_activity_id; + delete from events_activities where activity_id = p_activity_id; - raise NOTICE ''Deleting note...''; + raise NOTICE ''Deleting note...''; PERFORM acs_object__delete(p_activity_id); return 0;