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 -N -r1.136.2.34 -r1.136.2.35 --- openacs-4/packages/acs-kernel/acs-kernel.info 6 Aug 2017 11:17:31 -0000 1.136.2.34 +++ openacs-4/packages/acs-kernel/acs-kernel.info 5 Oct 2017 10:25:28 -0000 1.136.2.35 @@ -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/postgresql/utilities-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql,v diff -u -N -r1.8.2.2 -r1.8.2.3 --- openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql 21 Dec 2016 00:14:56 -0000 1.8.2.2 +++ openacs-4/packages/acs-kernel/sql/postgresql/utilities-create.sql 5 Oct 2017 10:25:28 -0000 1.8.2.3 @@ -289,13 +289,11 @@ -- -- procedure util__get_primary_keys/1 -- -CREATE OR REPLACE FUNCTION util__get_primary_keys( - p_table text -) RETURNS SETOF pg_attribute.attname%TYPE AS $$ +CREATE OR REPLACE FUNCTION util__get_primary_keys(text) RETURNS SETOF pg_attribute.attname%TYPE AS $$ SELECT a.attname FROM pg_index i JOIN pg_attribute a ON a.attrelid = i.indrelid AND a.attnum = ANY(i.indkey) - WHERE i.indrelid = p_table::regclass + WHERE i.indrelid = $1::regclass AND i.indisprimary; $$ LANGUAGE sql; Index: openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.9.1-5.9.2d1.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-kernel/sql/postgresql/upgrade/Attic/upgrade-5.9.1-5.9.2d1.sql,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/acs-kernel/sql/postgresql/upgrade/upgrade-5.9.1-5.9.2d1.sql 5 Oct 2017 10:25:28 -0000 1.1.2.1 @@ -0,0 +1,20 @@ + +begin; + +-- added +select define_function_args('util__get_primary_keys','table'); + +-- +-- procedure util__get_primary_keys/1 +-- +DROP FUNCTION util__get_primary_keys(text); +CREATE OR REPLACE FUNCTION util__get_primary_keys(text) RETURNS SETOF pg_attribute.attname%TYPE AS $$ + SELECT a.attname + FROM pg_index i + JOIN pg_attribute a ON a.attrelid = i.indrelid + AND a.attnum = ANY(i.indkey) + WHERE i.indrelid = $1::regclass + AND i.indisprimary; +$$ LANGUAGE sql; + +end;