Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 10 Apr 2001 23:53:26 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-create.sql 17 Apr 2001 23:41:36 -0000 1.4 @@ -63,22 +63,22 @@ create function acs__add_user (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,varchar,char,char,varchar,varchar,varchar,boolean,varchar) returns integer as ' declare - user_id alias for $1; - object_type alias for $2; - creation_date alias for $3; - creation_user alias for $4; - creation_ip alias for $5; + user_id alias for $1; -- default null + object_type alias for $2; -- default ''user'' + creation_date alias for $3; -- default now() + creation_user alias for $4; -- default null + creation_ip alias for $5; -- default null email alias for $6; - url alias for $7; + url alias for $7; -- default null first_names alias for $8; last_name alias for $9; password alias for $10; salt alias for $11; - password_question alias for $12; - password_answer alias for $13; - screen_name alias for $14; - email_verified_p alias for $15; - member_state alias for $16; + password_question alias for $12; -- default null + password_answer alias for $13; -- default null + screen_name alias for $14; -- default null + email_verified_p alias for $15; -- default ''t'' + member_state alias for $16; -- default ''approved'' v_user_id users.user_id%TYPE; v_rel_id membership_rels.rel_id%TYPE; begin Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 14 Apr 2001 05:12:22 -0000 1.5 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-metadata-create.sql 17 Apr 2001 23:41:36 -0000 1.6 @@ -596,11 +596,11 @@ create_type__pretty_plural alias for $3; create_type__supertype alias for $4; create_type__table_name alias for $5; - create_type__id_column alias for $6; - create_type__package_name alias for $7; - create_type__abstract_p alias for $8; - create_type__type_extension_table alias for $9; - create_type__name_method alias for $10; + create_type__id_column alias for $6; -- default ''XXX'' + create_type__package_name alias for $7; -- default null + create_type__abstract_p alias for $8; -- default ''f'' + create_type__type_extension_table alias for $9; -- default null + create_type__name_method alias for $10; -- default null v_package_name acs_object_types.package_name%TYPE; v_name_method varchar; v_idx integer; @@ -639,7 +639,7 @@ returns integer as ' declare drop_type__object_type alias for $1; - drop_type__cascade_p alias for $2; + drop_type__cascade_p alias for $2; -- default ''f'' row record; begin @@ -725,15 +725,15 @@ create_attribute__attribute_name alias for $2; create_attribute__datatype alias for $3; create_attribute__pretty_name alias for $4; - create_attribute__pretty_plural alias for $5; - create_attribute__table_name alias for $6; - create_attribute__column_name alias for $7; - create_attribute__default_value alias for $8; - create_attribute__min_n_values alias for $9; - create_attribute__max_n_values alias for $10; - create_attribute__sort_order alias for $11; - create_attribute__storage alias for $12; - create_attribute__static_p alias for $13; + create_attribute__pretty_plural alias for $5; -- default null + create_attribute__table_name alias for $6; -- default null + create_attribute__column_name alias for $7; -- default null + create_attribute__default_value alias for $8; -- default null + create_attribute__min_n_values alias for $9; -- default 1 + create_attribute__max_n_values alias for $10; -- default 1 + create_attribute__sort_order alias for $11; -- default null + create_attribute__storage alias for $12; -- default ''type_specific'' + create_attribute__static_p alias for $13; -- default ''f'' v_sort_order acs_attributes.sort_order%TYPE; v_attribute_id acs_attributes.attribute_id%TYPE; 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 -r1.17 -r1.18 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 14 Apr 2001 05:12:22 -0000 1.17 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-objects-create.sql 17 Apr 2001 23:41:36 -0000 1.18 @@ -647,12 +647,12 @@ create function acs_object__new (integer,varchar,timestamp,integer,varchar,integer) returns integer as ' declare - new__object_id alias for $1; - new__object_type alias for $2; - new__creation_date alias for $3; - new__creation_user alias for $4; - new__creation_ip alias for $5; - new__context_id alias for $6; + new__object_id alias for $1; -- default null + new__object_type alias for $2; -- default ''acs_object'' + new__creation_date alias for $3; -- default now() + new__creation_user alias for $4; -- default null + new__creation_ip alias for $5; -- default null + new__context_id alias for $6; -- default null v_object_id acs_objects.object_id%TYPE; begin if new__object_id is null then @@ -677,8 +677,8 @@ create function acs_object__new (integer,varchar) returns integer as ' declare - object_id alias for $1; - object_type alias for $2; + object_id alias for $1; -- default null + object_type alias for $2; -- default ''acs_object'' begin return acs_object__new(object_id,object_type,now(),null,null,null); end;' language 'plpgsql'; Index: openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql,v diff -u -r1.9 -r1.10 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 24 Mar 2001 00:34:53 -0000 1.9 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-permissions-create.sql 17 Apr 2001 23:41:36 -0000 1.10 @@ -310,8 +310,8 @@ returns integer as ' declare create_privilege__privilege alias for $1; - create_privilege__pretty_name alias for $2; - create_privilege__pretty_plural alias for $3; + create_privilege__pretty_name alias for $2; -- default null + create_privilege__pretty_plural alias for $3; -- default null begin insert into acs_privileges (privilege, pretty_name, pretty_plural) 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 -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 22 Mar 2001 00:09:24 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/acs-relationships-create.sql 17 Apr 2001 23:41:36 -0000 1.7 @@ -140,8 +140,8 @@ returns integer as ' declare create_role__role alias for $1; - create_role__pretty_name alias for $2; - create_role__pretty_plural alias for $3; + create_role__pretty_name alias for $2; -- default null + create_role__pretty_plural alias for $3; -- default null begin insert into acs_rel_roles (role, pretty_name, pretty_plural) @@ -204,16 +204,16 @@ create_type__rel_type alias for $1; create_type__pretty_name alias for $2; create_type__pretty_plural alias for $3; - create_type__supertype alias for $4; + create_type__supertype alias for $4; -- default ''relationship'' create_type__table_name alias for $5; create_type__id_column alias for $6; create_type__package_name alias for $7; create_type__object_type_one alias for $8; - create_type__role_one alias for $9; + create_type__role_one alias for $9; -- default null create_type__min_n_rels_one alias for $10; create_type__max_n_rels_one alias for $11; create_type__object_type_two alias for $12; - create_type__role_two alias for $13; + create_type__role_two alias for $13; -- default null create_type__min_n_rels_two alias for $14; create_type__max_n_rels_two alias for $15; @@ -259,11 +259,11 @@ create_type__rel_type alias for $1; create_type__pretty_name alias for $2; create_type__pretty_plural alias for $3; - create_type__supertype alias for $4; + create_type__supertype alias for $4; -- default ''relationship'' create_type__table_name alias for $5; create_type__id_column alias for $6; create_type__package_name alias for $7; - create_type__type_extension_table alias for $8; + create_type__type_extension_table alias for $8; -- default null create_type__object_type_one alias for $9; create_type__min_n_rels_one alias for $10; create_type__max_n_rels_one alias for $11; @@ -312,7 +312,7 @@ returns integer as ' declare drop_type__rel_type alias for $1; - drop_type__cascade_p alias for $2; + drop_type__cascade_p alias for $2; -- default ''f'' begin -- XXX do cascade_p delete from acs_rel_types @@ -489,13 +489,13 @@ create function acs_rel__new (integer,varchar,integer,integer,integer,integer,varchar) returns integer as ' declare - new__rel_id alias for $1; - new__rel_type alias for $2; + new__rel_id alias for $1; -- default null + new__rel_type alias for $2; -- default ''relationship'' new__object_id_one alias for $3; new__object_id_two alias for $4; - context_id alias for $5; - creation_user alias for $6; - creation_ip alias for $7; + context_id alias for $5; -- default null + creation_user alias for $6; -- default null + creation_ip alias for $7; -- default null v_rel_id acs_rels.rel_id%TYPE; begin -- XXX This should check that object_id_one and object_id_two are 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 -r1.9 -r1.10 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 14 Apr 2001 05:29:11 -0000 1.9 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 17 Apr 2001 23:41:36 -0000 1.10 @@ -1635,9 +1635,9 @@ pretty_plural alias for $3; package_uri alias for $4; package_type alias for $5; - singleton_p alias for $6; - spec_file_path alias for $7; - spec_file_mtime alias for $8; + singleton_p alias for $6; -- default ''f'' + spec_file_path alias for $7; -- default null + spec_file_mtime alias for $8; -- default null begin PERFORM apm_package_type__create_type( package_key, @@ -1659,13 +1659,13 @@ returns varchar as ' declare package_key alias for $1; - pretty_name alias for $2; - pretty_plural alias for $3; - package_uri alias for $4; - package_type alias for $5; - singleton_p alias for $6; - spec_file_path alias for $7; - spec_file_mtime alias for $8; + pretty_name alias for $2; -- default null + pretty_plural alias for $3; -- default null + package_uri alias for $4; -- default null + package_type alias for $5; -- default null + singleton_p alias for $6; -- default null + spec_file_path alias for $7; -- default null + spec_file_mtime alias for $8; -- default null begin return apm_package_type__update_type( @@ -1687,7 +1687,7 @@ returns integer as ' declare package_key alias for $1; - cascade_p alias for $2; + cascade_p alias for $2; -- default ''t'' begin PERFORM apm_package_type__drop_type( package_key, @@ -1722,9 +1722,9 @@ pretty_name alias for $2; pretty_plural alias for $3; package_uri alias for $4; - singleton_p alias for $5; - spec_file_path alias for $6; - spec_file_mtime alias for $7; + singleton_p alias for $5; -- default ''f'' + spec_file_path alias for $6; -- default null + spec_file_mtime alias for $7; -- default null begin PERFORM apm__register_package( package_key, @@ -1746,7 +1746,7 @@ returns integer as ' declare package_key alias for $1; - cascade_p alias for $2; + cascade_p alias for $2; -- default ''f'' begin PERFORM apm__unregister_package ( package_key, @@ -1765,9 +1765,9 @@ pretty_name alias for $2; pretty_plural alias for $3; package_uri alias for $4; - singleton_p alias for $5; - spec_file_path alias for $6; - spec_file_mtime alias for $7; + singleton_p alias for $5; -- default ''f'' + spec_file_path alias for $6; -- default null + spec_file_mtime alias for $7; -- default null begin PERFORM apm__register_package( package_key, @@ -1789,7 +1789,7 @@ returns integer as ' declare package_key alias for $1; - cascade_p alias for $2; + cascade_p alias for $2; -- default ''f'' begin PERFORM apm__unregister_package ( package_key, @@ -1804,15 +1804,15 @@ create function apm__register_parameter (integer,varchar,varchar,varchar,varchar,varchar,varchar,integer,integer) returns integer as ' declare - register_parameter__parameter_id alias for $1; + register_parameter__parameter_id alias for $1; -- default null register_parameter__package_key alias for $2; register_parameter__parameter_name alias for $3; - register_parameter__description alias for $4; - register_parameter__datatype alias for $5; - register_parameter__default_value alias for $6; - register_parameter__section_name alias for $7; - register_parameter__min_n_values alias for $8; - register_parameter__max_n_values alias for $9; + register_parameter__description alias for $4; -- default null + register_parameter__datatype alias for $5; -- default ''string'' + register_parameter__default_value alias for $6; -- default null + register_parameter__section_name alias for $7; -- default null + register_parameter__min_n_values alias for $8; -- default 1 + register_parameter__max_n_values alias for $9; -- default 1 v_parameter_id apm_parameters.parameter_id%TYPE; cur_val record; @@ -1862,13 +1862,13 @@ returns varchar as ' declare update_parameter__parameter_id alias for $1; - update_parameter__parameter_name alias for $2; - update_parameter__description alias for $3; - update_parameter__datatype alias for $4; - update_parameter__default_value alias for $5; - update_parameter__section_name alias for $6; - update_parameter__min_n_values alias for $7; - update_parameter__max_n_values alias for $8; + update_parameter__parameter_name alias for $2; -- default null + update_parameter__description alias for $3; -- default null + update_parameter__datatype alias for $4; -- default ''string'' + update_parameter__default_value alias for $5; -- default null + update_parameter__section_name alias for $6; -- default null + update_parameter__min_n_values alias for $7; -- default 1 + update_parameter__max_n_values alias for $8; -- default 1 begin update apm_parameters set parameter_name = coalesce(update_parameter__parameter_name, parameter_name), @@ -1907,7 +1907,7 @@ create function apm__unregister_parameter (integer) returns integer as ' declare - unregister_parameter__parameter_id alias for $1; + unregister_parameter__parameter_id alias for $1; -- default null begin delete from apm_parameter_values where parameter_id = unregister_parameter__parameter_id; @@ -2070,14 +2070,14 @@ create function apm_package__new (integer,varchar,varchar,varchar,timestamp,integer,varchar,integer) returns integer as ' declare - new__package_id alias for $1; - new__instance_name alias for $2; + new__package_id alias for $1; -- default null + new__instance_name alias for $2; -- default null new__package_key alias for $3; - new__object_type alias for $4; - new__creation_date alias for $5; - new__creation_user alias for $6; - new__creation_ip alias for $7; - new__context_id alias for $8; + new__object_type alias for $4; -- default ''apm_package'' + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__creation_ip alias for $7; -- default null + new__context_id alias for $8; -- default null v_singleton_p integer; v_package_type apm_package_types.package_type%TYPE; v_num_instances integer; @@ -2262,18 +2262,18 @@ -- create or replace package body apm_package_version create function apm_package_version__new (integer,varchar,varchar,varchar,varchar,varchar,varchar,timestamp,varchar,varchar,boolean,boolean) returns integer as ' declare - apm_pkg_ver__version_id alias for $1; + apm_pkg_ver__version_id alias for $1; -- default null apm_pkg_ver__package_key alias for $2; - apm_pkg_ver__version_name alias for $3; + apm_pkg_ver__version_name alias for $3; -- default null apm_pkg_ver__version_uri alias for $4; apm_pkg_ver__summary alias for $5; apm_pkg_ver__description_format alias for $6; apm_pkg_ver__description alias for $7; apm_pkg_ver__release_date alias for $8; apm_pkg_ver__vendor alias for $9; apm_pkg_ver__vendor_uri alias for $10; - apm_pkg_ver__installed_p alias for $11; - apm_pkg_ver__data_model_loaded_p alias for $12; + apm_pkg_ver__installed_p alias for $11; -- default ''f'' + apm_pkg_ver__data_model_loaded_p alias for $12; -- default ''f'' v_version_id apm_package_versions.version_id%TYPE; begin if apm_pkg_ver__version_id='''' then @@ -2364,7 +2364,7 @@ returns integer as ' declare copy__version_id alias for $1; - copy__new_version_id alias for $2; + copy__new_version_id alias for $2; -- default null copy__new_version_name alias for $3; copy__new_version_uri alias for $4; v_version_id integer; @@ -2411,18 +2411,18 @@ create function apm_package_version__edit (integer,integer,varchar,varchar,varchar,varchar,varchar,timestamp,varchar,varchar,char,char) returns integer as ' declare - edit__new_version_id alias for $1; + edit__new_version_id alias for $1; -- default null edit__version_id alias for $2; - edit__version_name alias for $3; + edit__version_name alias for $3; -- default null edit__version_uri alias for $4; edit__summary alias for $5; edit__description_format alias for $6; edit__description alias for $7; edit__release_date alias for $8; edit__vendor alias for $9; edit__vendor_uri alias for $10; - edit__installed_p alias for $11; - edit__data_model_loaded_p alias for $12; + edit__installed_p alias for $11; -- default ''f'' + edit__data_model_loaded_p alias for $12; -- default ''f'' v_version_id apm_package_versions.version_id%TYPE; version_unchanged_p integer; begin @@ -2463,11 +2463,11 @@ create function apm_package_version__add_file (integer,integer,varchar,varchar, varchar) returns integer as ' declare - add_file__file_id alias for $1; + add_file__file_id alias for $1; -- default null add_file__version_id alias for $2; add_file__path alias for $3; add_file__file_type alias for $4; - add_file__db_type alias for $5; + add_file__db_type alias for $5; -- default null v_file_id apm_package_files.file_id%TYPE; v_file_exists_p integer; begin @@ -2513,7 +2513,7 @@ create function apm_package_version__add_interface (integer,integer,varchar,varchar) returns integer as ' declare - add_interface__interface_id alias for $1; + add_interface__interface_id alias for $1; -- default null add_interface__version_id alias for $2; add_interface__interface_uri alias for $3; add_interface__interface_version alias for $4; @@ -2571,7 +2571,7 @@ create function apm_package_version__add_dependency (integer,integer,varchar,varchar) returns integer as ' declare - add_dependency__dependency_id alias for $1; + add_dependency__dependency_id alias for $1; -- default null add_dependency__version_id alias for $2; add_dependency__dependency_uri alias for $3; add_dependency__dependency_version alias for $4; @@ -2801,8 +2801,8 @@ create_type__package_uri alias for $4; create_type__package_type alias for $5; create_type__singleton_p alias for $6; - create_type__spec_file_path alias for $7; - create_type__spec_file_mtime alias for $8; + create_type__spec_file_path alias for $7; -- default null + create_type__spec_file_mtime alias for $8; -- default null begin insert into apm_package_types (package_key, pretty_name, pretty_plural, package_uri, package_type, @@ -2821,13 +2821,13 @@ returns varchar as ' declare update_type__package_key alias for $1; - update_type__pretty_name alias for $2; - update_type__pretty_plural alias for $3; - update_type__package_uri alias for $4; - update_type__package_type alias for $5; - update_type__singleton_p alias for $6; - update_type__spec_file_path alias for $7; - update_type__spec_file_mtime alias for $8; + update_type__pretty_name alias for $2; -- default null + update_type__pretty_plural alias for $3; -- default null + update_type__package_uri alias for $4; -- default null + update_type__package_type alias for $5; -- default null + update_type__singleton_p alias for $6; -- default null + update_type__spec_file_path alias for $7; -- default null + update_type__spec_file_mtime alias for $8; -- default null begin UPDATE apm_package_types SET pretty_name = coalesce(update_type__pretty_name, pretty_name), @@ -2849,7 +2849,7 @@ returns integer as ' declare drop_type__package_key alias for $1; - drop_type__cascade_p alias for $2; + drop_type__cascade_p alias for $2; -- default ''f'' cur_val record; begin if drop_type__cascade_p = ''t'' then @@ -2908,7 +2908,7 @@ create function apm_parameter_value__new (integer,integer,integer,varchar) returns integer as ' declare - new__value_id alias for $1; + new__value_id alias for $1; -- default null new__package_id alias for $2; new__parameter_id alias for $3; new__attr_value alias for $4; @@ -2936,7 +2936,7 @@ create function apm_parameter_value__delete (integer) returns integer as ' declare - delete__value_id alias for $1; + delete__value_id alias for $1; -- default null begin delete from apm_parameter_values where value_id = delete__value_id; @@ -2950,14 +2950,14 @@ create function apm_application__new (integer,varchar,varchar,varchar,timestamp,integer,varchar,integer) returns integer as ' declare - application_id alias for $1; - instance_name alias for $2; + application_id alias for $1; -- default null + instance_name alias for $2; -- default null package_key alias for $3; - object_type alias for $4; - creation_date alias for $5; - creation_user alias for $6; - creation_ip alias for $7; - context_id alias for $8; + object_type alias for $4; -- default ''apm_application'' + creation_date alias for $5; -- default now() + creation_user alias for $6; -- default null + creation_ip alias for $7; -- default null + context_id alias for $8; -- default null v_application_id integer; begin v_application_id := apm_package__new ( @@ -3000,14 +3000,14 @@ create function apm_service__new (integer,varchar,varchar,varchar,timestamp,integer,varchar,integer) returns integer as ' declare - service_id alias for $1; - instance_name alias for $2; + service_id alias for $1; -- default null + instance_name alias for $2; -- default null package_key alias for $3; - object_type alias for $4; - creation_date alias for $5; - creation_user alias for $6; - creation_ip alias for $7; - context_id alias for $8; + object_type alias for $4; -- default ''apm_service'' + creation_date alias for $5; -- default now() + creation_user alias for $6; -- default null + creation_ip alias for $7; -- default null + context_id alias for $8; -- default null v_service_id integer; begin v_service_id := apm_package__new ( Index: openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 18 Mar 2001 05:22:27 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/community-core-create.sql 17 Apr 2001 23:41:36 -0000 1.3 @@ -304,14 +304,14 @@ create function party__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,integer) returns integer as ' declare - new__party_id alias for $1; - new__object_type alias for $2; - new__creation_date alias for $3; - new__creation_user alias for $4; - new__creation_ip alias for $5; + new__party_id alias for $1; -- default null + new__object_type alias for $2; -- default ''party'' + new__creation_date alias for $3; -- default now() + new__creation_user alias for $4; -- default null + new__creation_ip alias for $5; -- default null new__email alias for $6; - new__url alias for $7; - new__context_id alias for $8; + new__url alias for $7; -- default null + new__context_id alias for $8; -- default null v_party_id parties.party_id%TYPE; begin v_party_id := @@ -416,16 +416,16 @@ create function person__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,varchar,integer) returns integer as ' declare - new__person_id alias for $1; - new__object_type alias for $2; - new__creation_date alias for $3; - new__creation_user alias for $4; - new__creation_ip alias for $5; + new__person_id alias for $1; -- default null + new__object_type alias for $2; -- default ''person'' + new__creation_date alias for $3; -- default now() + new__creation_user alias for $4; -- default null + new__creation_ip alias for $5; -- default null new__email alias for $6; - new__url alias for $7; - new__first_names alias for $8; + new__url alias for $7; -- default null + new__first_names alias for $8; new__last_name alias for $9; - new__context_id alias for $10; + new__context_id alias for $10; -- default null v_person_id persons.person_id%TYPE; begin v_person_id := @@ -617,22 +617,22 @@ create function acs_user__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,varchar,char,char,varchar,varchar,varchar,boolean,integer) returns integer as ' declare - new__user_id alias for $1; - new__object_type alias for $2; - new__creation_date alias for $3; - new__creation_user alias for $4; - new__creation_ip alias for $5; + new__user_id alias for $1; -- default null + new__object_type alias for $2; -- default ''user'' + new__creation_date alias for $3; -- default now() + new__creation_user alias for $4; -- default null + new__creation_ip alias for $5; -- default null new__email alias for $6; - new__url alias for $7; + new__url alias for $7; -- default null new__first_names alias for $8; new__last_name alias for $9; new__password alias for $10; new__salt alias for $11; - new__password_question alias for $12; - new__password_answer alias for $13; - new__screen_name alias for $14; - new__email_verified_p alias for $15; - new__context_id alias for $16; + new__password_question alias for $12; -- default null + new__password_answer alias for $13; -- default null + new__screen_name alias for $14; -- default null + new__email_verified_p alias for $15; -- default ''t'' + new__context_id alias for $16; -- default null v_user_id users.user_id%TYPE; begin v_user_id := 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 -r1.8 -r1.9 --- openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 14 Apr 2001 05:12:22 -0000 1.8 +++ openacs-4/packages/acs-kernel/sql/postgresql/groups-body-create.sql 17 Apr 2001 23:41:36 -0000 1.9 @@ -272,12 +272,12 @@ create function composition_rel__new (integer,varchar,integer,integer,integer,varchar) returns integer as ' declare - new__rel_id alias for $1; - rel_type alias for $2; + new__rel_id alias for $1; -- default null + rel_type alias for $2; -- default ''composition_rel'' object_id_one alias for $3; object_id_two alias for $4; - creation_user alias for $5; - creation_ip alias for $6; + creation_user alias for $5; -- default null + creation_ip alias for $6; -- default null v_rel_id integer; begin v_rel_id := acs_rel__new ( @@ -486,13 +486,13 @@ create function membership_rel__new (integer,varchar,integer,integer,varchar,integer,varchar) returns integer as ' declare - new__rel_id alias for $1; - rel_type alias for $2; + new__rel_id alias for $1; -- default null + rel_type alias for $2; -- default ''membership_rel'' object_id_one alias for $3; object_id_two alias for $4; - new__member_state alias for $5; - creation_user alias for $6; - creation_ip alias for $7; + new__member_state alias for $5; -- default ''approved'' + creation_user alias for $6; -- default null + creation_ip alias for $7; -- default null v_rel_id integer; begin v_rel_id := acs_rel__new ( @@ -705,16 +705,16 @@ create function acs_group__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,varchar,integer) returns integer as ' declare - new__group_id alias for $1; - new__object_type alias for $2; - new__creation_date alias for $3; - new__creation_user alias for $4; - new__creation_ip alias for $5; - new__email alias for $6; - new__url alias for $7; + new__group_id alias for $1; -- default null + new__object_type alias for $2; -- default ''group'' + new__creation_date alias for $3; -- default now() + new__creation_user alias for $4; -- default null + new__creation_ip alias for $5; -- default null + new__email alias for $6; -- default null + new__url alias for $7; -- default null new__group_name alias for $8; - new__join_policy alias for $9; - new__context_id alias for $10; + new__join_policy alias for $9; -- default null + new__context_id alias for $10; -- default null v_group_id groups.group_id%TYPE; v_group_type_exists_p integer; v_join_policy groups.join_policy%TYPE; Index: openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql 14 Mar 2001 04:39:10 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/postgresql/journal-create.sql 17 Apr 2001 23:41:36 -0000 1.2 @@ -91,14 +91,14 @@ create function journal_entry__new (integer,integer,varchar,varchar,timestamp,integer,varchar,varchar) returns integer as ' declare - new__journal_id alias for $1; + new__journal_id alias for $1; -- default null new__object_id alias for $2; new__action alias for $3; - new__action_pretty alias for $4; - new__creation_date alias for $5; - new__creation_user alias for $6; - new__creation_ip alias for $7; - new__msg alias for $8; + new__action_pretty alias for $4; -- default null + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__creation_ip alias for $7; -- default null + new__msg alias for $8; -- default null v_journal_id journal_entries.journal_id%TYPE; begin v_journal_id := acs_object__new ( Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql 14 Apr 2001 05:12:22 -0000 1.5 +++ openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-body-create.sql 17 Apr 2001 23:41:36 -0000 1.6 @@ -18,15 +18,15 @@ create function rel_constraint__new (integer,varchar,varchar,integer,char,integer,integer,integer,varchar) returns integer as ' declare - new__constraint_id alias for $1; - new__constraint_type alias for $2; + new__constraint_id alias for $1; -- default null + new__constraint_type alias for $2; -- default ''rel_constraint'' new__constraint_name alias for $3; new__rel_segment alias for $4; - new__rel_side alias for $5; + new__rel_side alias for $5; -- default ''two'' new__required_rel_segment alias for $6; - new__context_id alias for $7; - new__creation_user alias for $8; - new__creation_ip alias for $9; + new__context_id alias for $7; -- default null + new__creation_user alias for $8; -- default null + new__creation_ip alias for $9; -- default null v_constraint_id rel_constraints.constraint_id%TYPE; begin v_constraint_id := acs_object__new ( Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-create.sql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-create.sql 24 Mar 2001 00:34:53 -0000 1.6 +++ openacs-4/packages/acs-kernel/sql/postgresql/rel-constraints-create.sql 17 Apr 2001 23:41:36 -0000 1.7 @@ -607,10 +607,8 @@ from rel_constraints rc, rel_constraints rc_required where rc.rel_segment in (select c2.rel_segment from rel_constraints c1, rel_constraints c2 - where exists (select 1 - from rel_constraints - where rel_side = 'two' - and rel_segment = c2.required_rel_segment) + where c2.rel_side = 'two' + and c1.rel_side = 'two' and c1.rel_segment = rc_required.rel_segment and c2.tree_sortkey <= c1.tree_sortkey and c1.tree_sortkey like (c2.tree_sortkey || '%')); Index: openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql 20 Mar 2001 06:02:57 -0000 1.3 +++ openacs-4/packages/acs-kernel/sql/postgresql/rel-segments-body-create.sql 17 Apr 2001 23:41:36 -0000 1.4 @@ -19,17 +19,17 @@ create function rel_segment__new (integer,varchar,timestamp,integer,varchar,varchar,varchar,varchar,integer,varchar,integer) returns integer as ' declare - new__segment_id alias for $1; - object_type alias for $2; - creation_date alias for $3; - creation_user alias for $4; - creation_ip alias for $5; - email alias for $6; - url alias for $7; + new__segment_id alias for $1; -- default null + object_type alias for $2; -- default ''rel_segment'' + creation_date alias for $3; -- default now() + creation_user alias for $4; -- default null + creation_ip alias for $5; -- default null + email alias for $6; -- default null + url alias for $7; -- default null new__segment_name alias for $8; new__group_id alias for $9; new__rel_type alias for $10; - context_id alias for $11; + context_id alias for $11; -- default null v_segment_id rel_segments.segment_id%TYPE; begin v_segment_id := @@ -94,7 +94,7 @@ declare get_or_new__group_id alias for $1; get_or_new__rel_type alias for $2; - segment_name alias for $3; + segment_name alias for $3; -- default null v_segment_id rel_segments.segment_id%TYPE; v_segment_name rel_segments.segment_name%TYPE; begin 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 -r1.9 -r1.10 --- openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 14 Apr 2001 05:12:22 -0000 1.9 +++ openacs-4/packages/acs-kernel/sql/postgresql/site-nodes-create.sql 17 Apr 2001 23:41:36 -0000 1.10 @@ -204,14 +204,14 @@ create function site_node__new (integer,integer,varchar,integer,boolean,boolean,integer,varchar) returns integer as ' declare - new__node_id alias for $1; - new__parent_id alias for $2; + new__node_id alias for $1; -- default null + new__parent_id alias for $2; -- default null new__name alias for $3; - new__object_id alias for $4; + new__object_id alias for $4; -- default null new__directory_p alias for $5; - new__pattern_p alias for $6; - new__creation_user alias for $7; - new__creation_ip alias for $8; + new__pattern_p alias for $6; -- default ''f'' + new__creation_user alias for $7; -- default null + new__creation_ip alias for $8; -- default null v_node_id site_nodes.node_id%TYPE; v_directory_p site_nodes.directory_p%TYPE; begin @@ -291,7 +291,7 @@ returns integer as ' declare node_id__url alias for $1; - node_id__parent_id alias for $2; + node_id__parent_id alias for $2; -- default null v_pos integer; v_first site_nodes.name%TYPE; v_rest text;