Index: openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql,v diff -u -r1.43 -r1.44 --- openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 29 Dec 2008 21:02:29 -0000 1.43 +++ openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 3 Feb 2009 02:05:07 -0000 1.44 @@ -36,11 +36,11 @@ constraint apm_packages_init_install_p_ck check (initial_install_p in ('t', 'f')), singleton_p char(1) default 'f' not null - constraint apm_packages_site_avail_p_ck + constraint apm_packages_singleton_p_ck check (singleton_p in ('t', 'f')), implements_subsite_p char(1) default 'f' not null constraint apm_packages_impl_subsite_p_ck - check (singleton_p in ('t', 'f')), + check (implements_subsite_p in ('t', 'f')), inherit_templates_p char(1) default 't' not null constraint apm_packages_inherit_t_p_ck check (inherit_templates_p in ('t', 'f')) @@ -1154,6 +1154,7 @@ function add_dependency( dependency_id in apm_package_dependencies.dependency_id%TYPE default null, + dependency_type in apm_package_dependencies.dependency_type%TYPE, version_id in apm_package_versions.version_id%TYPE, dependency_uri in apm_package_dependencies.service_uri%TYPE, dependency_version in apm_package_dependencies.service_version%TYPE @@ -1227,7 +1228,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -1369,7 +1370,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -2214,6 +2215,7 @@ function add_dependency( dependency_id in apm_package_dependencies.dependency_id%TYPE default null, + dependency_type in apm_package_dependencies.dependency_type%TYPE, version_id in apm_package_versions.version_id%TYPE, dependency_uri in apm_package_dependencies.service_uri%TYPE, dependency_version in apm_package_dependencies.service_version%TYPE @@ -2230,8 +2232,8 @@ insert into apm_package_dependencies (dependency_id, version_id, dependency_type, service_uri, service_version) values - (v_dep_id, add_dependency.version_id, 'requires', add_dependency.dependency_uri, - add_dependency.dependency_version); + (v_dep_id, add_dependency.version_id, add_dependency.dependency_type, + add_dependency.dependency_uri, add_dependency.dependency_version); return v_dep_id; end add_dependency; @@ -2458,7 +2460,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -2478,7 +2480,7 @@ initial_install_p = nvl(update_type.initial_install_p, initial_install_p), singleton_p = nvl(update_type.singleton_p, singleton_p), implements_subsite_p = nvl(update_type.implements_subsite_p, implements_subsite_p), - inherits_subsite_p = nvl(update_type.implements_subsite_p, implements_subsite_p) + inherit_templates_p = nvl(update_type.inherit_templates_p, inherit_templates_p) where package_key = update_type.package_key; return update_type.package_key; end update_type; Index: openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql,v diff -u -r1.13 -r1.14 --- openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 26 Sep 2006 14:48:02 -0000 1.13 +++ openacs-4/packages/acs-kernel/sql/oracle/authentication-create.sql 3 Feb 2009 02:05:07 -0000 1.14 @@ -62,7 +62,13 @@ constraint auth_authority_bs_enabled_p_nn not null constraint auth_authority_bs_enabled_p_ck - check (batch_sync_enabled_p in ('t','f')) + check (batch_sync_enabled_p in ('t','f')), + allow_user_entered_info_p char(1) default 'f' + constraint auth_auth_allow_user_i_p_nn + not null, + search_impl_id integer + constraint auth_auth_search_impl_id_fk + references acs_objects(object_id) ); comment on column auth_authorities.help_contact_text is ' Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d1-5.5.0d2.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d1-5.5.0d2.sql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d1-5.5.0d2.sql 19 Sep 2008 01:13:25 -0000 1.2 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d1-5.5.0d2.sql 3 Feb 2009 02:05:07 -0000 1.3 @@ -1,8 +1,8 @@ -alter table auth_authorities add allow_user_entered_info_p; -update auth_authorities set allow_user_entered_info_p 'f'; -alter table auth_authorities add constraint auth_authority_allow_user_i_p_nn (allow_user_entered_email_p) not null; -alter table auth_authorities add constraint auth_authority_allow_user_i_ck - check (allow_user_entered_info_p in ('t','f')) -alter table auth_authorities alter allow_user_entered_info_p set default 'f'; +alter table auth_authorities add allow_user_entered_info_p char(1); +update auth_authorities set allow_user_entered_info_p = 'f'; +alter table auth_authorities modify (allow_user_entered_info_p not null); +alter table auth_authorities add constraint auth_auth_allow_user_i_ck + check (allow_user_entered_info_p in ('t','f')); +alter table auth_authorities modify (allow_user_entered_info_p default 'f'); alter table auth_authorities add search_impl_id integer; -alter table auth_authorities add constraint foreign key auth_authorities_search_impl_id_fk (auth_authorities_search_impl_id) references acs_objects(object_id); +alter table auth_authorities add constraint auth_auth_search_impl_id_fk foreign key (search_impl_id) references acs_objects(object_id); Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d3-5.5.0d4.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d3-5.5.0d4.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d3-5.5.0d4.sql 25 Nov 2008 17:08:49 -0000 1.1 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.5.0d3-5.5.0d4.sql 3 Feb 2009 02:05:07 -0000 1.2 @@ -79,9 +79,9 @@ -- Add a requirement for this version. A requirement is some interface that this -- version depends on. function add_dependency( - dependency_type in apm_package_dependenceis.dependency_type%TYPE, dependency_id in apm_package_dependencies.dependency_id%TYPE default null, + dependency_type in apm_package_dependencies.dependency_type%TYPE, version_id in apm_package_versions.version_id%TYPE, dependency_uri in apm_package_dependencies.service_uri%TYPE, dependency_version in apm_package_dependencies.service_version%TYPE @@ -360,9 +360,9 @@ -- Add a requirement for this version. A requirement is some interface that this -- version depends on. function add_dependency( - dependency_type in apm_package_dependenceis.dependency_type%TYPE, dependency_id in apm_package_dependencies.dependency_id%TYPE default null, + dependency_type in apm_package_dependencies.dependency_type%TYPE, version_id in apm_package_versions.version_id%TYPE, dependency_uri in apm_package_dependencies.service_uri%TYPE, dependency_version in apm_package_dependencies.service_version%TYPE @@ -821,7 +821,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -896,7 +896,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -1298,7 +1298,7 @@ singleton_p in apm_package_types.singleton_p%TYPE default null, implements_subsite_p in apm_package_types.implements_subsite_p%TYPE - default null + default null, inherit_templates_p in apm_package_types.inherit_templates_p%TYPE default null, spec_file_path in apm_package_types.spec_file_path%TYPE @@ -1318,7 +1318,7 @@ initial_install_p = nvl(update_type.initial_install_p, initial_install_p), singleton_p = nvl(update_type.singleton_p, singleton_p), implements_subsite_p = nvl(update_type.implements_subsite_p, implements_subsite_p), - inherits_subsite_p = nvl(update_type.implements_subsite_p, implements_subsite_p) + inherit_templates_p = nvl(update_type.inherit_templates_p, inherit_templates_p) where package_key = update_type.package_key; return update_type.package_key; end update_type;