Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package.sql,v diff -u -r1.7 -r1.8 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package.sql 18 Apr 2001 05:41:27 -0000 1.7 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-case-package.sql 18 Apr 2001 23:27:46 -0000 1.8 @@ -151,13 +151,13 @@ create function workflow_case__new (integer,varchar,varchar,integer,timestamp,integer,varchar) returns integer as ' declare - new__case_id alias for $1; + new__case_id alias for $1; -- default null new__workflow_key alias for $2; - new__context_key alias for $3; + new__context_key alias for $3; -- default null new__object_id alias for $4; - new__creation_date alias for $5; - new__creation_user alias for $6; - new__creation_ip alias for $7; + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__creation_ip alias for $7; -- default null v_case_id integer; v_workflow_case_table varchar; v_context_key_for_query varchar; @@ -266,9 +266,9 @@ returns integer as ' declare start_case__case_id alias for $1; - start_case__creation_user alias for $2; - start_case__creation_ip alias for $3; - start_case__msg alias for $4; + start_case__creation_user alias for $2; -- default null + start_case__creation_ip alias for $3; -- default null + start_case__msg alias for $4; -- default null v_journal_id integer; begin /* Add an entry to the journal */ @@ -357,9 +357,9 @@ returns integer as ' declare suspend__case_id alias for $1; - suspend__user_id alias for $2; - suspend__ip_address alias for $3; - suspend__msg alias for $4; + suspend__user_id alias for $2; -- default null + suspend__ip_address alias for $3; -- default null + suspend__msg alias for $4; -- default null v_state varchar; v_journal_id integer; begin @@ -396,9 +396,9 @@ returns integer as ' declare resume__case_id alias for $1; - resume__user_id alias for $2; - resume__ip_address alias for $3; - resume__msg alias for $4; + resume__user_id alias for $2; -- default null + resume__ip_address alias for $3; -- default null + resume__msg alias for $4; -- default null v_state varchar; v_journal_id integer; begin @@ -435,9 +435,9 @@ returns integer as ' declare cancel__case_id alias for $1; - cancel__user_id alias for $2; - cancel__ip_address alias for $3; - cancel__msg alias for $4; + cancel__user_id alias for $2; -- default null + cancel__ip_address alias for $3; -- default null + cancel__msg alias for $4; -- default null v_state varchar; v_journal_id integer; begin @@ -524,7 +524,7 @@ begin_task_action__action alias for $2; begin_task_action__action_ip alias for $3; begin_task_action__user_id alias for $4; - begin_task_action__msg alias for $5; + begin_task_action__msg alias for $5; -- default null v_state varchar; v_journal_id integer; v_case_id integer; @@ -657,7 +657,7 @@ task_action__action alias for $2; task_action__action_ip alias for $3; task_action__user_id alias for $4; - task_action__msg alias for $5; + task_action__msg alias for $5; -- default null v_journal_id integer; begin v_journal_id := workflow_case__begin_task_action( @@ -1282,7 +1282,7 @@ consume_token__case_id alias for $1; consume_token__place_key alias for $2; consume_token__journal_id alias for $3; - consume_token__task_id alias for $4; + consume_token__task_id alias for $4; -- default null begin if consume_token__task_id is null then update wf_tokens Index: openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-package.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-package.sql,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-package.sql 13 Apr 2001 13:27:42 -0000 1.5 +++ openacs-4/contrib/obsolete-packages/acs-workflow/sql/postgresql/workflow-package.sql 18 Apr 2001 23:27:46 -0000 1.6 @@ -118,10 +118,10 @@ declare create_workflow__workflow_key alias for $1; create_workflow__pretty_name alias for $2; - create_workflow__pretty_plural alias for $3; - create_workflow__description alias for $4; + create_workflow__pretty_plural alias for $3; -- default null + create_workflow__description alias for $4; -- default null create_workflow__table_name alias for $5; - create_workflow__id_column alias for $6; + create_workflow__id_column alias for $6; -- default ''case_id'' v_num_rows integer; v_workflow_key varchar; begin @@ -276,15 +276,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__wf_datatype 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 ''generic'' + create_attribute__wf_datatype alias for $13; -- default ''none'' v_attribute_id integer; begin v_attribute_id := acs_attribute__create_attribute( @@ -377,9 +377,9 @@ declare add_transition__workflow_key alias for $1; add_transition__transition_key alias for $2; - add_transition__transition_name alias for $3; + add_transition__transition_name alias for $3; add_transition__sort_order alias for $4; - add_transition__trigger_type alias for $5; + add_transition__trigger_type alias for $5; -- default ''user'' begin insert into wf_transitions (workflow_key, transition_key, transition_name, sort_order, trigger_type) @@ -415,9 +415,9 @@ add_arc__transition_key alias for $2; add_arc__place_key alias for $3; add_arc__direction alias for $4; - add_arc__guard_callback alias for $5; - add_arc__guard_custom_arg alias for $6; - add_arc__guard_description alias for $7; + add_arc__guard_callback alias for $5; -- default null + add_arc__guard_custom_arg alias for $6; -- default null + add_arc__guard_description alias for $7; -- default null begin insert into wf_arcs (workflow_key, transition_key, place_key, direction, Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql 17 Apr 2001 04:10:06 -0000 1.4 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-extlink.sql 18 Apr 2001 23:27:46 -0000 1.5 @@ -15,15 +15,15 @@ create function content_extlink__new (varchar,varchar,varchar,varchar,integer,integer,timestamp,integer,varchar) returns integer as ' declare - new__name alias for $1; + new__name alias for $1; -- default null new__url alias for $2; - new__label alias for $3; - new__description alias for $4; + new__label alias for $3; -- default null + new__description alias for $4; -- default null new__parent_id alias for $5; - new__extlink_id alias for $6; - new__creation_date alias for $7; - new__creation_user alias for $8; - new__creation_ip alias for $9; + new__extlink_id alias for $6; -- default null + new__creation_date alias for $7; -- default now() + new__creation_user alias for $8; -- default null + new__creation_ip alias for $9; -- default null v_extlink_id cr_extlinks.extlink_id%TYPE; v_label cr_extlinks.label%TYPE; v_name cr_items.name%TYPE; Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 4 Apr 2001 23:56:49 -0000 1.10 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-folder.sql 18 Apr 2001 23:27:46 -0000 1.11 @@ -17,8 +17,8 @@ declare new__name alias for $1; new__label alias for $2; - new__description alias for $3; - new__parent_id alias for $4; + new__description alias for $3; -- default null + new__parent_id alias for $4; -- default null begin return content_folder__new(new__name, new__label, @@ -38,13 +38,13 @@ declare new__name alias for $1; new__label alias for $2; - new__description alias for $3; - new__parent_id alias for $4; - new__context_id alias for $5; - new__folder_id alias for $6; - new__creation_date alias for $7; - new__creation_user alias for $8; - new__creation_ip alias for $9; + new__description alias for $3; -- default null + new__parent_id alias for $4; -- default null + new__context_id alias for $5; -- default null + new__folder_id alias for $6; -- default null + new__creation_date alias for $7; -- default now() + new__creation_user alias for $8; -- default null + new__creation_ip alias for $9; -- default null v_folder_id cr_folders.folder_id%TYPE; v_context_id acs_objects.context_id%TYPE; begin @@ -161,9 +161,9 @@ returns integer as ' declare rename__folder_id alias for $1; - rename__name alias for $2; - rename__label alias for $3; - rename__description alias for $4; + rename__name alias for $2; -- default null + rename__label alias for $3; -- default null + rename__description alias for $4; -- default null v_name_already_exists_p integer; begin @@ -271,7 +271,7 @@ copy__folder_id alias for $1; copy__target_folder_id alias for $2; copy__creation_user alias for $3; - copy__creation_ip alias for $4; + copy__creation_ip alias for $4; -- default null v_valid_folders_p integer v_current_folder_id cr_folders.folder_id%TYPE; v_name cr_items.name%TYPE; @@ -465,7 +465,7 @@ declare register_content_type__folder_id alias for $1; register_content_type__content_type alias for $2; - register_content_type__include_subtypes alias for $3; + register_content_type__include_subtypes alias for $3; -- default ''f'' v_is_registered varchar; begin @@ -536,7 +536,7 @@ declare unregister_content_type__folder_id alias for $1; unregister_content_type__content_type alias for $2; - unregister_content_type__include_subtypes alias for $3; + unregister_content_type__include_subtypes alias for $3; -- default ''f'' begin if unregister_content_type__include_subtypes = ''f'' then @@ -576,7 +576,7 @@ declare is_registered__folder_id alias for $1; is_registered__content_type alias for $2; - is_registered__include_subtypes alias for $3; + is_registered__include_subtypes alias for $3; -- default ''f'' v_is_registered integer; v_subtype_val record; begin Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql,v diff -u -r1.11 -r1.12 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 4 Apr 2001 23:56:49 -0000 1.11 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-item.sql 18 Apr 2001 23:27:46 -0000 1.12 @@ -18,7 +18,7 @@ create function content_item__get_root_folder (integer) returns integer as ' declare - get_root_folder__item_id alias for $1; + get_root_folder__item_id alias for $1; -- default null v_folder_id cr_folders.folder_id%TYPE; begin @@ -67,22 +67,22 @@ returns integer as ' declare new__name alias for $1; - new__parent_id alias for $2; - new__item_id alias for $3; - new__locale alias for $4; - new__creation_date alias for $5; - new__creation_user alias for $6; - new__context_id alias for $7; - new__creation_ip alias for $8; - new__item_subtype alias for $9; - new__content_type alias for $10; - new__title alias for $11; - new__description alias for $12; - new__mime_type alias for $13; - new__nls_language alias for $14; - new__text alias for $15; + new__parent_id alias for $2; -- default null + new__item_id alias for $3; -- default null + new__locale alias for $4; -- default null + new__creation_date alias for $5; -- default now() + new__creation_user alias for $6; -- default null + new__context_id alias for $7; -- default null + new__creation_ip alias for $8; -- default null + new__item_subtype alias for $9; -- default ''content_item'' + new__content_type alias for $10; -- default ''content_revision'' + new__title alias for $11; -- default null + new__description alias for $12; -- default null + new__mime_type alias for $13; -- default ''text/plain'' + new__nls_language alias for $14; -- default null + new__text alias for $15; -- default null -- changed to integer for blob_id - new__data alias for $16; + new__data alias for $16; -- default null -- relation_tag alias for $17; -- is_live alias for $18; new__relation_tag varchar default null; @@ -265,10 +265,10 @@ returns integer as ' declare new__name alias for $1; - new__parent_id alias for $2; - new__title alias for $3; - new__description alias for $4; - new__text alias for $5; + new__parent_id alias for $2; -- default null + new__title alias for $3; -- default null + new__description alias for $4; -- default null + new__text alias for $5; -- default null begin return content_item__new(new__name, new__parent_id, @@ -670,8 +670,8 @@ returns integer as ' declare get_id__item_path alias for $1; - get_id__root_folder_id alias for $2; - get_id__resolve_index alias for $3; + get_id__root_folder_id alias for $2; -- default null + get_id__resolve_index alias for $3; -- default ''f'' v_item_path varchar; v_root_folder_id cr_items.item_id%TYPE; get_id__parent_id integer; @@ -758,7 +758,7 @@ returns varchar as ' declare get_path__item_id alias for $1; - get_path__root_folder_id alias for $2; + get_path__root_folder_id alias for $2; -- default null v_count integer; v_name varchar; v_parent_id integer default 0; @@ -936,7 +936,7 @@ returns varchar as ' declare get_virtual_path__item_id alias for $1; - get_virtual_path__root_folder_id alias for $2; + get_virtual_path__root_folder_id alias for $2; -- default content_item_globals.c_root_folder_id v_path varchar; v_item_id cr_items.item_id%TYPE; v_is_folder boolean; @@ -1030,8 +1030,8 @@ returns integer as ' declare unregister_template__item_id alias for $1; - unregister_template__template_id alias for $2; - unregister_template__use_context alias for $3; + unregister_template__template_id alias for $2; -- default null + unregister_template__use_context alias for $3; -- default null begin @@ -1163,11 +1163,11 @@ -- procedure set_live_revision -create function content_item__set_live_revision (integer) +create function content_item__set_live_revision (integer,varchar) returns integer as ' declare set_live_revision__revision_id alias for $1; - set_live_revision__publish_status cr_items.publish_status%TYPE default ''ready''; + set_live_revision__publish_status alias for $2; -- default ''ready'' begin update @@ -1227,8 +1227,8 @@ returns integer as ' declare set_release_period__item_id alias for $1; - set_release_period__start_when alias for $2; - set_release_period__end_when alias for $3; + set_release_period__start_when alias for $2; -- default null + set_release_period__end_when alias for $3; -- default null v_count integer; begin @@ -1347,7 +1347,7 @@ item_id alias for $1; target_folder_id alias for $2; creation_user alias for $3; - creation_ip alias for $4; + creation_ip alias for $4; -- default null copy_id cr_items.item_id%TYPE; begin @@ -1372,7 +1372,7 @@ copy2__item_id alias for $1; copy2__target_folder_id alias for $2; copy2__creation_user alias for $3; - copy2__creation_ip alias for $4; + copy2__creation_ip alias for $4; -- default null v_current_folder_id cr_folders.folder_id%TYPE; v_num_revisions integer; v_name cr_items.name%TYPE; @@ -1547,7 +1547,7 @@ returns varchar as ' declare get_title__item_id alias for $1; - get_title__is_live alias for $2; + get_title__is_live alias for $2; -- default ''f'' v_title cr_revisions.title%TYPE; v_content_type cr_items.content_type%TYPE; begin @@ -1593,7 +1593,7 @@ returns timestamp as ' declare get_publish_date__item_id alias for $1; - get_publish_date__is_live alias for $2; + get_publish_date__is_live alias for $2; -- default ''f'' v_revision_id cr_revisions.revision_id%TYPE; v_publish_date cr_revisions.publish_date%TYPE; begin @@ -1676,9 +1676,9 @@ declare relate__item_id alias for $1; relate__object_id alias for $2; - relate__relation_tag alias for $3; - relate__order_n alias for $4; - relate__relation_type alias for $5; + relate__relation_tag alias for $3; -- default ''generic'' + relate__order_n alias for $4; -- default null + relate__relation_type alias for $5; -- default ''cr_item_rel'' v_content_type cr_items.content_type%TYPE; v_object_type acs_objects.object_type%TYPE; v_is_valid integer; Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql 2 Apr 2001 05:35:29 -0000 1.5 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-keyword.sql 18 Apr 2001 23:27:46 -0000 1.6 @@ -97,13 +97,13 @@ returns integer as ' declare new__heading alias for $1; - new__description alias for $2; - new__parent_id alias for $3; - new__keyword_id alias for $4; - new__creation_date alias for $5; - new__creation_user alias for $6; - new__creation_ip alias for $7; - new__object_type alias for $8; + new__description alias for $2; -- default null + new__parent_id alias for $3; -- default null + new__keyword_id 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__object_type alias for $8; -- default ''content_keyword'' v_id integer; begin @@ -151,9 +151,9 @@ declare item_assign__item_id alias for $1; item_assign__keyword_id alias for $2; - item_assign__context_id alias for $3; - item_assign__creation_user alias for $4; - item_assign__creation_ip alias for $5; + item_assign__context_id alias for $3; -- default null + item_assign__creation_user alias for $4; -- default null + item_assign__creation_ip alias for $5; -- default null exists_p boolean; begin @@ -198,7 +198,7 @@ declare is_assigned__item_id alias for $1; is_assigned__keyword_id alias for $2; - is_assigned__recurse alias for $3; + is_assigned__recurse alias for $3; -- default ''none'' v_ret boolean; begin Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-perms.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/Attic/content-perms.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-perms.sql 2 Apr 2001 05:35:29 -0000 1.5 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-perms.sql 18 Apr 2001 23:27:46 -0000 1.6 @@ -59,7 +59,7 @@ declare inherit_permissions__parent_object_id alias for $1; inherit_permissions__child_object_id alias for $2; - inherit_permissions__child_creator_id alias for $3; + inherit_permissions__child_creator_id alias for $3; -- default null v_dummy integer; begin @@ -240,12 +240,12 @@ create function content_permission__grant_permission (integer,integer,varchar,integer,boolean,varchar) returns integer as ' declare - grant_permission__object_id alias for $1; - grant_permission__holder_id alias for $2; - grant_permission__privilege alias for $3; - grant_permission__recepient_id alias for $4; - grant_permission__is_recursive alias for $5; - grant_permission__object_type alias for $6; + grant_permission__object_id alias for $1; + grant_permission__holder_id alias for $2; + grant_permission__privilege alias for $3; + grant_permission__recepient_id alias for $4; + grant_permission__is_recursive alias for $5; -- default ''f'' + grant_permission__object_type alias for $6; -- default ''content_item'' v_object_id acs_objects.object_id%TYPE; begin -- select @@ -327,12 +327,12 @@ create function content_permission__revoke_permission (integer,integer,varchar,integer,boolean,varchar) returns integer as ' declare - revoke_permission__object_id alias for $1; - revoke_permission__holder_id alias for $2; - revoke_permission__privilege alias for $3; - revoke_permission__revokee_id alias for $4; - revoke_permission__is_recursive alias for $5; - revoke_permission__object_type alias for $6; + revoke_permission__object_id alias for $1; + revoke_permission__holder_id alias for $2; + revoke_permission__privilege alias for $3; + revoke_permission__revokee_id alias for $4; + revoke_permission__is_recursive alias for $5; -- default ''f'' + revoke_permission__object_type alias for $6; -- default ''content_item'' v_rec record; begin -- select object_id, object_type from acs_objects Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 7 Apr 2001 15:54:55 -0000 1.10 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-revision.sql 18 Apr 2001 23:27:46 -0000 1.11 @@ -17,17 +17,17 @@ returns integer as ' declare new__title alias for $1; - new__description alias for $2; - new__publish_date alias for $3; - new__mime_type alias for $4; - new__nls_language alias for $5; + new__description alias for $2; -- default null + new__publish_date alias for $3; -- default now() + new__mime_type alias for $4; -- default ''text/plain'' + new__nls_language alias for $5; -- default null -- blob id FIXME new__data alias for $6; new__item_id alias for $7; - new__revision_id alias for $8; - new__creation_date alias for $9; - new__creation_user alias for $10; - new__creation_ip alias for $11; + new__revision_id alias for $8; -- default null + new__creation_date alias for $9; -- default now() + new__creation_user alias for $10; -- default null + new__creation_ip alias for $11; -- default null v_revision_id integer; v_content_type acs_object_types.object_type%TYPE; begin @@ -90,16 +90,16 @@ returns integer as ' declare new__title alias for $1; - new__description alias for $2; - new__publish_date alias for $3; - new__mime_type alias for $4; - new__nls_language alias for $5; - new__text alias for $6; + new__description alias for $2; -- default null + new__publish_date alias for $3; -- default now() + new__mime_type alias for $4; -- default ''text/plain'' + new__nls_language alias for $5; -- default null + new__text alias for $6; -- default '' '' new__item_id alias for $7; - new__revision_id alias for $8; - new__creation_date alias for $9; - new__creation_user alias for $10; - new__creation_ip alias for $11; + new__revision_id alias for $8; -- default null + new__creation_date alias for $9; -- default now() + new__creation_user alias for $10; -- default null + new__creation_ip alias for $11; -- default null v_revision_id integer; v_content_type acs_object_types.object_type%TYPE; begin @@ -173,10 +173,10 @@ returns integer as ' declare copy__revision_id alias for $1; - copy__copy_id alias for $2; - copy__target_item_id alias for $3; - copy__creation_user alias for $4; - copy__creation_ip alias for $5; + copy__copy_id alias for $2; -- default null + copy__target_item_id alias for $3; -- default null + copy__creation_user alias for $4; -- default null + copy__creation_ip alias for $5; -- default null v_copy_id cr_revisions.revision_id%TYPE; v_target_item_id cr_items.item_id%TYPE; type_rec record; @@ -523,7 +523,7 @@ returns integer as ' declare content_copy__revision_id alias for $1; - content_copy__revision_id_dest alias for $2; + content_copy__revision_id_dest alias for $2; -- default null lobs blob; lobd blob; v_item_id cr_items.item_id%TYPE; Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 3 Apr 2001 05:01:31 -0000 1.5 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-symlink.sql 18 Apr 2001 23:27:46 -0000 1.6 @@ -15,14 +15,14 @@ create function content_symlink__new (varchar,varchar,integer,integer,integer,timestamp,integer,varchar) returns integer as ' declare - new__name alias for $1; - new__label alias for $2; + new__name alias for $1; -- default null + new__label alias for $2; -- default null new__target_id alias for $3; new__parent_id alias for $4; - new__symlink_id alias for $5; - new__creation_date alias for $6; - new__creation_user alias for $7; - new__creation_ip alias for $8; + new__symlink_id alias for $5; -- default null + new__creation_date alias for $6; -- default now() + new__creation_user alias for $7; -- default null + new__creation_ip alias for $8; -- default null v_symlink_id cr_symlinks.symlink_id%TYPE; v_name cr_items.name%TYPE; v_label cr_symlinks.label%TYPE; @@ -150,7 +150,7 @@ copy__symlink_id alias for $1; copy__target_folder_id alias for $2; copy__creation_user alias for $3; - copy__creation_ip alias for $4; + copy__creation_ip alias for $4; -- default null v_current_folder_id cr_folders.folder_id%TYPE; v_name cr_items.name%TYPE; v_target_id cr_items.item_id%TYPE; Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 2 Apr 2001 05:35:29 -0000 1.4 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-template.sql 18 Apr 2001 23:27:46 -0000 1.5 @@ -39,11 +39,11 @@ returns integer as ' declare new__name alias for $1; - new__parent_id alias for $2; - new__template_id alias for $3; - new__creation_date alias for $4; - new__creation_user alias for $5; - new__creation_ip alias for $6; + new__parent_id alias for $2; -- default null + new__template_id alias for $3; -- default null + new__creation_date alias for $4; -- default now() + new__creation_user alias for $5; -- default null + new__creation_ip alias for $6; -- default null v_template_id cr_templates.template_id%TYPE; v_parent_id cr_items.parent_id%TYPE; begin @@ -133,7 +133,7 @@ returns varchar as ' declare template_id alias for $1; - root_folder_id alias for $2; + root_folder_id alias for $2; -- default content_template_globals.c_root_folder_id begin Index: openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 3 Apr 2001 12:10:22 -0000 1.12 +++ openacs-4/packages/acs-content-repository/sql/postgresql/content-type.sql 18 Apr 2001 23:27:46 -0000 1.13 @@ -49,12 +49,12 @@ returns integer as ' declare create_type__content_type alias for $1; - create_type__supertype alias for $2; + create_type__supertype alias for $2; -- default ''content_revision'' create_type__pretty_name alias for $3; create_type__pretty_plural alias for $4; - create_type__table_name alias for $5; - create_type__id_column alias for $6; - create_type__name_method alias for $7; + create_type__table_name alias for $5; -- default null + create_type__id_column alias for $6; -- default ''XXX'' + create_type__name_method alias for $7; -- default null table_exists boolean; v_supertype_table acs_object_types.table_name%TYPE; @@ -98,8 +98,8 @@ returns integer as ' declare drop_type__content_type alias for $1; - drop_type__drop_children_p alias for $2; - drop_type__drop_table_p alias for $3; + drop_type__drop_children_p alias for $2; -- default ''f'' + drop_type__drop_table_p alias for $3; -- default ''f'' table_exists boolean; v_table_name varchar; is_subclassed_p boolean; @@ -183,10 +183,10 @@ 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__sort_order alias for $6; - create_attribute__default_value alias for $7; - create_attribute__column_spec alias for $8; + create_attribute__pretty_plural alias for $5; -- default null + create_attribute__sort_order alias for $6; -- default null + create_attribute__default_value alias for $7; -- default null + create_attribute__column_spec alias for $8; -- default ''text'' v_attr_id acs_attributes.attribute_id%TYPE; v_table_name acs_object_types.table_name%TYPE; v_column_exists boolean; @@ -242,7 +242,7 @@ declare drop_attribute__content_type alias for $1; drop_attribute__attribute_name alias for $2; - drop_attribute__drop_column alias for $3; + drop_attribute__drop_column alias for $3; -- default ''f'' v_attr_id acs_attributes.attribute_id%TYPE; v_table acs_object_types.table_name%TYPE; begin @@ -293,7 +293,7 @@ register_template__content_type alias for $1; register_template__template_id alias for $2; register_template__use_context alias for $3; - register_template__is_default alias for $4; + register_template__is_default alias for $4; -- default ''f'' v_template_registered boolean; begin select @@ -401,9 +401,9 @@ create function content_type__unregister_template (varchar,integer,varchar) returns integer as ' declare - unregister_template__content_type alias for $1; - unregister_template__template_id alias for $2; - unregister_template__use_context alias for $3; + unregister_template__content_type alias for $1; -- default null + unregister_template__template_id alias for $2; + unregister_template__use_context alias for $3; -- default null begin if unregister_template__use_context is null and @@ -668,12 +668,12 @@ create function content_type__register_child_type (varchar,varchar,varchar,integer,integer) returns integer as ' declare - register_child_type__parent_type alias for $1; - register_child_type__child_type alias for $2; - register_child_type__relation_tag alias for $3; - register_child_type__min_n alias for $4; - register_child_type__max_n alias for $5; - v_exists integer; + register_child_type__parent_type alias for $1; + register_child_type__child_type alias for $2; + register_child_type__relation_tag alias for $3; -- default ''generic'' + register_child_type__min_n alias for $4; -- default 0 + register_child_type__max_n alias for $5; -- default null + v_exists integer; begin select count(*) into v_exists @@ -716,8 +716,7 @@ declare unregister_child_type__parent_type alias for $1; unregister_child_type__child_type alias for $2; - unregister_child_type__relation_tag alias for $3; - + unregister_child_type__relation_tag alias for $3; -- default null begin delete from @@ -737,12 +736,12 @@ create function content_type__register_relation_type (varchar,varchar,varchar,integer,integer) returns integer as ' declare - register_relation_type__content_type alias for $1; - register_relation_type__target_type alias for $2; - register_relation_type__relation_tag alias for $3; - register_relation_type__min_n alias for $4; - register_relation_type__max_n alias for $5; - v_exists integer; + register_relation_type__content_type alias for $1; + register_relation_type__target_type alias for $2; + register_relation_type__relation_tag alias for $3; -- default ''generic'' + register_relation_type__min_n alias for $4; -- default 0 + register_relation_type__max_n alias for $5; -- default null + v_exists integer; begin -- check if the relation type exists @@ -789,9 +788,9 @@ create function content_type__unregister_relation_type (varchar,varchar,varchar) returns integer as ' declare - unregister_relation_type__content_type alias for $1; - unregister_relation_type__target_type alias for $2; - unregister_relation_type__relation_tag alias for $3; + unregister_relation_type__content_type alias for $1; + unregister_relation_type__target_type alias for $2; + unregister_relation_type__relation_tag alias for $3; -- default null begin