Index: openacs-4/packages/acs-bootstrap-installer/installer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/acs-bootstrap-installer/installer.tcl 19 Jan 2018 21:23:51 -0000 1.28 +++ openacs-4/packages/acs-bootstrap-installer/installer.tcl 15 May 2018 11:41:54 -0000 1.29 @@ -387,30 +387,6 @@ cd [file join $::acs::rootdir packages acs-kernel sql [db_type]] db_source_sql_file -callback apm_ns_write_callback acs-kernel-create.sql - # DRB: Now initialize the APM's table of known database types. This is - # butt-ugly. We could have apm-create.sql do this but that would mean - # adding a new database type would require editing two places (the very - # obvious list in bootstrap.tcl and the less-obvious list in apm-create.sql). - # On the other hand, this is ugly because now this code knows about the - # apm datamodel as well as the existence of the special acs-kernel module. - - set apm_db_types_exists [db_string db_types_exists " - select case when count(*) = 0 then 0 else 1 end from apm_package_db_types"] - - if { !$apm_db_types_exists } { - ns_log Notice "Populating apm_package_db_types" - foreach known_db_type [db_known_database_types] { - set db_type [lindex $known_db_type 0] - set db_pretty_name [lindex $known_db_type 2] - db_dml insert_apm_db_type { - insert into apm_package_db_types - (db_type_key, pretty_db_name) - values - (:db_type, :db_pretty_name) - } - } - } - ns_write " Done installing the OpenACS kernel data model.

Index: openacs-4/packages/acs-kernel/acs-kernel.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/acs-kernel.info,v diff -u -r1.145 -r1.146 --- openacs-4/packages/acs-kernel/acs-kernel.info 1 May 2018 10:45:43 -0000 1.145 +++ openacs-4/packages/acs-kernel/acs-kernel.info 15 May 2018 11:41:54 -0000 1.146 @@ -9,15 +9,15 @@ f t - + OpenACS Core Team

Routines and data models providing the foundation for OpenACS-based Web services. 2017-08-06 OpenACS The OpenACS kernel contains the core datamodel create and drop scripts for such things as objects, groups, partiies and the supporting PL/SQL and PL/pgSQL procedures. 3 - + 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.56 -r1.57 --- openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 24 Dec 2017 13:10:49 -0000 1.56 +++ openacs-4/packages/acs-kernel/sql/oracle/apm-create.sql 15 May 2018 11:41:54 -0000 1.57 @@ -538,20 +538,6 @@ select * from apm_package_version_info where enabled_p = 't'; -create table apm_package_db_types ( - db_type_key varchar2(50) - constraint apm_package_db_types_pk primary key, - pretty_db_name varchar2(200) - constraint apm_package_db_types_name_nn not null -); - -comment on table apm_package_db_types is ' - A list of all the different kinds of database engines that an APM package can - support. This table is initialized in acs-tcl/tcl/apm-init.tcl rather than in - PL/SQL in order to guarantee that the list of supported database engines is - consistent between the bootstrap code and the package manager. -'; - create table apm_parameters ( parameter_id constraint apm_parameters_parameter_id_fk references acs_objects(object_id) Index: openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.0d6-5.10.0d7.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.0d6-5.10.0d7.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-kernel/sql/oracle/upgrade/upgrade-5.10.0d6-5.10.0d7.sql 15 May 2018 11:41:54 -0000 1.1 @@ -0,0 +1,5 @@ + +-- remove legacy table apm_package_db_types: we now have this +-- information in a threaded cache + +drop table apm_package_db_types; 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.77 -r1.78 --- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 24 Dec 2017 13:10:50 -0000 1.77 +++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 15 May 2018 11:41:54 -0000 1.78 @@ -693,20 +693,6 @@ select * from apm_package_version_info where enabled_p = 't'; -create table apm_package_db_types ( - db_type_key varchar(50) - constraint apm_package_db_types_pk primary key, - pretty_db_name varchar(200) - constraint apm_package_db_types_name_nn not null -); - -comment on table apm_package_db_types is ' - A list of all the different kinds of database engines that an APM package can - support. This table is initialized in acs-tcl/tcl/apm-init.tcl rather than in - PL/SQL in order to guarantee that the list of supported database engines is - consistent between the bootstrap code and the package manager. -'; - create table apm_parameters ( parameter_id integer constraint apm_parameters_parameter_id_fk references acs_objects(object_id) Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.0d6-5.10.0d7.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.0d6-5.10.0d7.sql,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.10.0d6-5.10.0d7.sql 15 May 2018 11:41:54 -0000 1.1 @@ -0,0 +1,5 @@ + +-- remove legacy table apm_package_db_types: we now have this +-- information in a threaded cache + +drop table apm_package_db_types;