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.17 -r1.18
--- openacs-4/packages/acs-kernel/acs-kernel.info 20 Sep 2002 21:37:45 -0000 1.17
+++ openacs-4/packages/acs-kernel/acs-kernel.info 24 Oct 2002 21:05:10 -0000 1.18
@@ -7,14 +7,14 @@
t
t
-
+
oracle
postgresql
Don Baccus
Routines and data models providing the foundation for OpenACS-based Web services.
- 2002-08-17
+ 2002-10-24
OpenACS
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.29 -r1.30
--- openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 23 Sep 2002 11:05:17 -0000 1.29
+++ openacs-4/packages/acs-kernel/sql/postgresql/apm-create.sql 24 Oct 2002 21:05:11 -0000 1.30
@@ -1881,7 +1881,7 @@
v_version_id apm_package_versions.version_id%TYPE;
begin
if apm_pkg_ver__version_id = '''' or apm_pkg_ver__version_id is null then
- select acs_object_id_seq.nextval
+ select nextval(''t_acs_object_id_seq'')
into v_version_id
from dual;
else
@@ -1993,12 +1993,12 @@
where version_id = copy__version_id;
insert into apm_package_dependencies(dependency_id, version_id, dependency_type, service_uri, service_version)
- select acs_object_id_seq.nextval, v_version_id, dependency_type, service_uri, service_version
+ select nextval(''t_acs_object_id_seq''), v_version_id, dependency_type, service_uri, service_version
from apm_package_dependencies
where version_id = copy__version_id;
insert into apm_package_files(file_id, version_id, path, file_type, db_type)
- select acs_object_id_seq.nextval, v_version_id, path, file_type, db_type
+ select nextval(''t_acs_object_id_seq''), v_version_id, path, file_type, db_type
from apm_package_files
where version_id = copy__version_id;
@@ -2086,7 +2086,7 @@
if NOT FOUND
then
if add_file__file_id is null then
- select acs_object_id_seq.nextval into v_file_id from dual;
+ select nextval(''t_acs_object_id_seq'') into v_file_id from dual;
else
v_file_id := add_file__file_id;
end if;
@@ -2128,7 +2128,7 @@
v_dep_id apm_package_dependencies.dependency_id%TYPE;
begin
if add_interface__interface_id is null then
- select acs_object_id_seq.nextval into v_dep_id from dual;
+ select nextval(''t_acs_object_id_seq'') into v_dep_id from dual;
else
v_dep_id := add_interface__interface_id;
end if;
@@ -2186,7 +2186,7 @@
v_dep_id apm_package_dependencies.dependency_id%TYPE;
begin
if add_dependency__dependency_id is null then
- select acs_object_id_seq.nextval into v_dep_id from dual;
+ select nextval(''t_acs_object_id_seq'') into v_dep_id from dual;
else
v_dep_id := add_dependency__dependency_id;
end if;
Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.5.1-4.5.2.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.5.1-4.5.2.sql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-4.5.1-4.5.2.sql 24 Oct 2002 21:05:12 -0000 1.1
@@ -0,0 +1,197 @@
+-- @author Eric Lorenzo (eric@openforce.net)
+-- @creation-date 2002/10/24
+
+
+-- apm-create.sql - Converting nextval references to not use view;
+-- bug causes failure in some cases.
+
+-- create or replace package body apm_package_version
+create or replace 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; -- default null
+ apm_pkg_ver__package_key alias for $2;
+ 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; -- 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 = '''' or apm_pkg_ver__version_id is null then
+ select nextval(''t_acs_object_id_seq'')
+ into v_version_id
+ from dual;
+ else
+ v_version_id := apm_pkg_ver__version_id;
+ end if;
+
+ v_version_id := acs_object__new(
+ v_version_id,
+ ''apm_package_version'',
+ now(),
+ null,
+ null,
+ null
+ );
+
+ insert into apm_package_versions
+ (version_id, package_key, version_name, version_uri, summary, description_format, description,
+ release_date, vendor, vendor_uri, installed_p, data_model_loaded_p)
+ values
+ (v_version_id, apm_pkg_ver__package_key, apm_pkg_ver__version_name,
+ apm_pkg_ver__version_uri, apm_pkg_ver__summary,
+ apm_pkg_ver__description_format, apm_pkg_ver__description,
+ apm_pkg_ver__release_date, apm_pkg_ver__vendor, apm_pkg_ver__vendor_uri,
+ apm_pkg_ver__installed_p, apm_pkg_ver__data_model_loaded_p);
+
+ return v_version_id;
+
+end;' language 'plpgsql';
+
+
+-- function copy
+create or replace function apm_package_version__copy (integer,integer,varchar,varchar,boolean)
+returns integer as '
+declare
+ copy__version_id alias for $1;
+ copy__new_version_id alias for $2; -- default null
+ copy__new_version_name alias for $3;
+ copy__new_version_uri alias for $4;
+ copy__copy_owners_p alias for $5;
+ v_version_id integer;
+begin
+ v_version_id := acs_object__new(
+ copy__new_version_id,
+ ''apm_package_version'',
+ now(),
+ null,
+ null,
+ null
+ );
+
+ insert into apm_package_versions(version_id, package_key, version_name,
+ version_uri, summary, description_format, description,
+ release_date, vendor, vendor_uri)
+ select v_version_id, package_key, copy__new_version_name,
+ copy__new_version_uri, summary, description_format, description,
+ release_date, vendor, vendor_uri
+ from apm_package_versions
+ where version_id = copy__version_id;
+
+ insert into apm_package_dependencies(dependency_id, version_id, dependency_type, service_uri, service_version)
+ select nextval(''t_acs_object_id_seq''), v_version_id, dependency_type, service_uri, service_version
+ from apm_package_dependencies
+ where version_id = copy__version_id;
+
+ insert into apm_package_files(file_id, version_id, path, file_type, db_type)
+ select nextval(''t_acs_object_id_seq''), v_version_id, path, file_type, db_type
+ from apm_package_files
+ where version_id = copy__version_id;
+
+ if copy__copy_owners_p then
+ insert into apm_package_owners(version_id, owner_uri, owner_name, sort_key)
+ select v_version_id, owner_uri, owner_name, sort_key
+ from apm_package_owners
+ where version_id = copy__version_id;
+ end if;
+
+ return v_version_id;
+
+end;' language 'plpgsql';
+
+
+-- function add_file
+create or replace function apm_package_version__add_file (integer,integer,varchar,varchar, varchar)
+returns integer as '
+declare
+ 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; -- default null
+ v_file_id apm_package_files.file_id%TYPE;
+ v_file_exists_p integer;
+begin
+ select file_id into v_file_id from apm_package_files
+ where version_id = add_file__version_id
+ and path = add_file__path;
+
+ if NOT FOUND
+ then
+ if add_file__file_id is null then
+ select nextval(''t_acs_object_id_seq'') into v_file_id from dual;
+ else
+ v_file_id := add_file__file_id;
+ end if;
+
+ insert into apm_package_files
+ (file_id, version_id, path, file_type, db_type)
+ values
+ (v_file_id, add_file__version_id, add_file__path, add_file__file_type, add_file__db_type);
+ end if;
+
+ return v_file_id;
+
+end;' language 'plpgsql';
+
+
+-- function add_interface
+create or replace function apm_package_version__add_interface (integer,integer,varchar,varchar)
+returns integer as '
+declare
+ 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;
+ v_dep_id apm_package_dependencies.dependency_id%TYPE;
+begin
+ if add_interface__interface_id is null then
+ select nextval(''t_acs_object_id_seq'') into v_dep_id from dual;
+ else
+ v_dep_id := add_interface__interface_id;
+ end if;
+
+ insert into apm_package_dependencies
+ (dependency_id, version_id, dependency_type, service_uri, service_version)
+ values
+ (v_dep_id, add_interface__version_id, ''provides'', add_interface__interface_uri,
+ add_interface__interface_version);
+
+ return v_dep_id;
+
+end;' language 'plpgsql';
+
+
+-- function add_dependency
+create or replace function apm_package_version__add_dependency (integer,integer,varchar,varchar)
+returns integer as '
+declare
+ 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;
+ v_dep_id apm_package_dependencies.dependency_id%TYPE;
+begin
+ if add_dependency__dependency_id is null then
+ select nextval(''t_acs_object_id_seq'') into v_dep_id from dual;
+ else
+ v_dep_id := add_dependency__dependency_id;
+ end if;
+
+ 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);
+
+ return v_dep_id;
+
+end;' language 'plpgsql';
+
+
+-- show errors