database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-20 00:42:27 +03:00
Code

Fix broken ruleutils support for function TRANSFORM clauses.

Browse Source 
I chanced to notice that this dumped core due to a faulty Assert.
To add insult to injury, the output has been misformatted since v11.
Obviously we need some regression testing here.

Discussion: https://postgr.es/m/d1cc628c-3953-4209-957b-29427acc38c8@www.fastmail.com
This commit is contained in:
Tom Lane 2021-01-25 13:03:12 -05:00
parent 9b1f8af47e
commit 41309f716e
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/hstore_plpython/expected/hstore_plpython.out
View File

@ -53,19 +53,29 @@ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
(1 row) (1 row)
-- test python -> hstore -- test python -> hstore
CREATE FUNCTION test2() RETURNS hstore CREATE FUNCTION test2(a int, b text) RETURNS hstore
LANGUAGE plpythonu LANGUAGE plpythonu
TRANSFORM FOR TYPE hstore TRANSFORM FOR TYPE hstore
AS $$ AS $$
val = {'a': 1, 'b': 'boo', 'c': None} val = {'a': a, 'b': b, 'c': None}
return val return val
$$; $$;
SELECT test2(); SELECT test2(1, 'boo');
test2 test2
--------------------------------- ---------------------------------
"a"=>"1", "b"=>"boo", "c"=>NULL "a"=>"1", "b"=>"boo", "c"=>NULL
(1 row) (1 row)
--- test ruleutils
\sf test2
CREATE OR REPLACE FUNCTION public.test2(a integer, b text)
RETURNS hstore
TRANSFORM FOR TYPE hstore
LANGUAGE plpythonu
AS $function$
val = {'a': a, 'b': b, 'c': None}
return val
$function$
-- test python -> hstore[] -- test python -> hstore[]
CREATE FUNCTION test2arr() RETURNS hstore[] CREATE FUNCTION test2arr() RETURNS hstore[]
LANGUAGE plpythonu LANGUAGE plpythonu

9
contrib/hstore_plpython/sql/hstore_plpython.sql
View File

@ -45,15 +45,18 @@ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);
-- test python -> hstore -- test python -> hstore
CREATE FUNCTION test2() RETURNS hstore CREATE FUNCTION test2(a int, b text) RETURNS hstore
LANGUAGE plpythonu LANGUAGE plpythonu
TRANSFORM FOR TYPE hstore TRANSFORM FOR TYPE hstore
AS $$ AS $$
val = {'a': 1, 'b': 'boo', 'c': None} val = {'a': a, 'b': b, 'c': None}
return val return val
$$; $$;
SELECT test2(); SELECT test2(1, 'boo');
--- test ruleutils
\sf test2
-- test python -> hstore[] -- test python -> hstore[]

5
src/backend/utils/fmgr/funcapi.c
View File

@ -935,7 +935,9 @@ get_func_arg_info(HeapTuple procTup,
/* /*
* get_func_trftypes * get_func_trftypes
* *
* Returns the number of transformed types used by function. * Returns the number of transformed types used by the function.
* If there are any, a palloc'd array of the type OIDs is returned
* into *p_trftypes.
*/ */
int int
get_func_trftypes(HeapTuple procTup, get_func_trftypes(HeapTuple procTup,
@ -964,7 +966,6 @@ get_func_trftypes(HeapTuple procTup,
ARR_HASNULL(arr) || ARR_HASNULL(arr) ||
ARR_ELEMTYPE(arr) != OIDOID) ARR_ELEMTYPE(arr) != OIDOID)
elog(ERROR, "protrftypes is not a 1-D Oid array"); elog(ERROR, "protrftypes is not a 1-D Oid array");
Assert(nelems >= ((Form_pg_proc) GETSTRUCT(procTup))->pronargs);
*p_trftypes = (Oid *) palloc(nelems * sizeof(Oid)); *p_trftypes = (Oid *) palloc(nelems * sizeof(Oid));
memcpy(*p_trftypes, ARR_DATA_PTR(arr), memcpy(*p_trftypes, ARR_DATA_PTR(arr),
nelems * sizeof(Oid)); nelems * sizeof(Oid));