Commit41309f7

committed

Fix broken ruleutils support for function TRANSFORM clauses.

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

1 parent9b1f8af commit41309f7Copy full SHA for 41309f7

File tree

+22

-8

lines changed

contrib/hstore_plpython
- expected
  - hstore_plpython.out
- sql
  - hstore_plpython.sql
src/backend/utils/fmgr
- funcapi.c

+22

-8

lines changed

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,19 +53,29 @@ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);`
`53`	`53`	`(1 row)`
`54`	`54`
`55`	`55`	`-- test python -> hstore`
`56`		`-CREATE FUNCTION test2() RETURNS hstore`
	`56`	`+CREATE FUNCTION test2(a int, b text) RETURNS hstore`
`57`	`57`	`LANGUAGE plpythonu`
`58`	`58`	`TRANSFORM FOR TYPE hstore`
`59`	`59`	`AS $$`
`60`		`-val = {'a':1, 'b':'boo', 'c': None}`
	`60`	`+val = {'a':a, 'b':b, 'c': None}`
`61`	`61`	`return val`
`62`	`62`	`$$;`
`63`		`-SELECT test2();`
	`63`	`+SELECT test2(1, 'boo');`
`64`	`64`	`test2`
`65`	`65`	`---------------------------------`
`66`	`66`	`"a"=>"1", "b"=>"boo", "c"=>NULL`
`67`	`67`	`(1 row)`
`68`	`68`
	`69`	`+--- test ruleutils`
	`70`	`+\sf test2`
	`71`	`+CREATE OR REPLACE FUNCTION public.test2(a integer, b text)`
	`72`	`+ RETURNS hstore`
	`73`	`+ TRANSFORM FOR TYPE hstore`
	`74`	`+ LANGUAGE plpythonu`
	`75`	`+AS $function$`
	`76`	`+val = {'a': a, 'b': b, 'c': None}`
	`77`	`+return val`
	`78`	`+$function$`
`69`	`79`	`-- test python -> hstore[]`
`70`	`80`	`CREATE FUNCTION test2arr() RETURNS hstore[]`
`71`	`81`	`LANGUAGE plpythonu`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,15 +45,18 @@ SELECT test1arr(array['aa=>bb, cc=>NULL'::hstore, 'dd=>ee']);`
`45`	`45`
`46`	`46`
`47`	`47`	`-- test python -> hstore`
`48`		`-CREATEFUNCTIONtest2() RETURNS hstore`
	`48`	`+CREATEFUNCTIONtest2(aint, btext) RETURNS hstore`
`49`	`49`	`LANGUAGE plpythonu`
`50`	`50`	`TRANSFORM FOR TYPE hstore`
`51`	`51`	`AS $$`
`52`		`-val= {'a':1,'b':'boo','c': None}`
	`52`	`+val= {'a':a,'b':b,'c': None}`
`53`	`53`	`return val`
`54`	`54`	`$$;`
`55`	`55`
`56`		`-SELECT test2();`
	`56`	`+SELECT test2(1,'boo');`
	`57`	`+`
	`58`	`+--- test ruleutils`
	`59`	`+\sf test2`
`57`	`60`
`58`	`61`
`59`	`62`	`-- test python -> hstore[]`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,9 @@ get_func_arg_info(HeapTuple procTup,`
`935`	`935`	`/*`
`936`	`936`	`* get_func_trftypes`
`937`	`937`	`*`
`938`		`- * Returns the number of transformed types used by function.`
	`938`	`+ * Returns the number of transformed types used by the function.`
	`939`	`+ * If there are any, a palloc'd array of the type OIDs is returned`
	`940`	`+ * into *p_trftypes.`
`939`	`941`	`*/`
`940`	`942`	`int`
`941`	`943`	`get_func_trftypes(HeapTupleprocTup,`
`@@ -964,7 +966,6 @@ get_func_trftypes(HeapTuple procTup,`
`964`	`966`	`ARR_HASNULL(arr)\|\|`
`965`	`967`	`ARR_ELEMTYPE(arr)!=OIDOID)`
`966`	`968`	`elog(ERROR,"protrftypes is not a 1-D Oid array");`
`967`		`-Assert(nelems >= ((Form_pg_proc)GETSTRUCT(procTup))->pronargs);`
`968`	`969`	`p_trftypes= (Oid)palloc(nelems*sizeof(Oid));`
`969`	`970`	`memcpy(*p_trftypes,ARR_DATA_PTR(arr),`
`970`	`971`	`nelems*sizeof(Oid));`

Comments

(0)