Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 20 Mar 2001 06:02:57 -0000 1.11 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 21 Mar 2001 05:46:40 -0000 1.12 @@ -657,7 +657,15 @@ end;' language 'plpgsql'; +create function acs_object__new (integer,varchar) returns integer as ' +declare + object_id alias for $1; + object_type alias for $2; +begin + return acs_object__new(object_id,object_type,now(),null,null,null); +end;' language 'plpgsql'; + -- procedure delete create function acs_object__delete (integer) returns integer as ' @@ -819,9 +827,7 @@ a.object_type = t.object_type; if NOT FOUND then - raise EXCEPTION ''-20000: %'', - ''No such attribute '' || v_object_type || ''::'' || - attribute_name_in || '' in acs_object.get_attribute_storage.''; + raise EXCEPTION ''-20000: No such attribute %::% in acs_object.get_attribute_storage.'', v_object_type, attribute_name_in''; end if; -- This should really be done in a trigger on acs_attributes, @@ -860,16 +866,10 @@ where object_type = v_object_type; if NOT FOUND then - raise EXCEPTION ''-20000: %'', - ''No data found for attribute '' || - v_object_type || ''::'' || attribute_name_in || - '' in acs_object.get_attribute_storage''; + raise EXCEPTION ''-20000: No data found for attribute %::% in acs_object.get_attribute_storage'', v_object_type, attribute_name_in; end if; else - raise EXCEPTION ''-20000: %'', - ''No table name specified for storage specific static attribute '' - || v_object_type || ''::'' || attribute_name_in || - '' in acs_object.get_attribute_storage.''; + raise EXCEPTION ''-20000: No table name specified for storage specific static attribute %::% in acs_object.get_attribute_storage.'',v_object_type, attribute_name_in; end if; end if; @@ -881,9 +881,7 @@ where object_type = v_object_type and table_name = v_table_name; if NOT FOUND then - raise EXCEPTION ''-20000: %'', ''No data found for attribute '' - || v_object_type || ''::'' || attribute_name_in || - '' in acs_object.get_attribute_storage''; + raise EXCEPTION ''-20000: No data found for attribute %::% in acs_object.get_attribute_storage'', v_object_type, attribute_name_in; end if; end if; @@ -1200,15 +1198,18 @@ return ''t''; end if; - if check_path__object_id = 0 then - return ''f''; - end if; - select context_id, security_inherit_p into check_path__context_id, check_path__security_inherit_p from acs_objects where object_id = check_path__object_id; + -- we should be able to handle the case where check_path fails + -- should we not? + + if check_path__object_id = 0 and check_path__context_id is null then + return ''f''; + end if; + if check_path__context_id is null or check_path__security_inherit_p = ''f'' then check_path__context_id := 0; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 20 Mar 2001 06:02:57 -0000 1.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 21 Mar 2001 05:46:40 -0000 1.5 @@ -446,7 +446,7 @@ and o1.object_id = new.object_id_one and o2.object_id = new.object_id_two; - raise EXCEPTION ''-20001: % violation: Invalid object types. Object % (%) must be of type % Object % (%) must be of type %'', new.rel_type, + raise EXCEPTION ''-20001: % violation: Invalid object types. Object % (%) must be of type % Object % (%) must be of type %'', new.rel_type, new.object_id_one, actual_object_type_one, target_object_type_one, Index: openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 18 Mar 2001 05:22:27 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 21 Mar 2001 05:46:40 -0000 1.3 @@ -2002,8 +2002,7 @@ if NOT FOUND then - raise EXCEPTION ''-20000: %'', ''The specified package '' - || set_value__package_id || '' does not exist in the system.''; + raise EXCEPTION ''-20000: The specified package % does not exist in the system.'', set_value__package_id; end if; PERFORM apm__set_value( Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 20 Mar 2001 06:02:57 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 21 Mar 2001 05:46:40 -0000 1.7 @@ -163,7 +163,7 @@ delete from group_element_index where rel_id = old.rel_id; - return new; + return old; end;' language 'plpgsql'; @@ -253,7 +253,7 @@ end loop; - return new; + return old; end;' language 'plpgsql'; @@ -787,10 +787,7 @@ from rel_segments where group_id = delete__group_id LOOP - raise notice '' rel_segment_delete %'', row.package_name; - PERFORM rel_segment__delete(row.segment_id); - end loop; -- Delete all the relations of any type to this group @@ -800,7 +797,6 @@ and (r.object_id_one = delete__group_id or r.object_id_two = delete__group_id) LOOP - raise notice '' delete %'', row.package_name; execute ''select '' || row.package_name || ''__delete('' || row.rel_id || '')''; end loop; Index: openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 20 Mar 2001 04:12:10 -0000 1.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-create.sql 21 Mar 2001 05:46:40 -0000 1.5 @@ -368,7 +368,7 @@ create function membership_rels_in_tr () returns opaque as ' declare begin - raise EXCEPTION ''-20000: %'', ''Insert to membership rels not yet supported''; + raise EXCEPTION ''-20000: Insert to membership rels not yet supported''; return new; @@ -383,7 +383,7 @@ create function composition_rels_in_tr () returns opaque as ' declare begin - raise EXCEPTION ''-20000: %'', ''Insert to membership rels not yet supported''; + raise EXCEPTION ''-20000: Insert to membership rels not yet supported''; return new; Index: openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 20 Mar 2001 06:02:57 -0000 1.4 +++ openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 21 Mar 2001 05:46:40 -0000 1.5 @@ -203,8 +203,7 @@ where node_id = new__parent_id; if v_directory_p = ''f'' then - raise EXCEPTION ''-20000: %'', - ''Node '' || new__parent_id || '' is not a directory''; + raise EXCEPTION ''-20000: Node % is not a directory'', new__parent_id; end if; end if;