Commit4641b2a

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 parent06cdfe2 commit4641b2aCopy full SHA for 4641b2a

File tree

+24

-9

lines changed

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

+24

-9

lines changed

Lines changed: 13 additions & 3 deletions

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

Lines changed: 6 additions & 3 deletions

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

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3103,13 +3103,14 @@ print_function_trftypes(StringInfo buf, HeapTuple proctup)`
`3103`	`3103`	`{`
`3104`	`3104`	`inti;`
`3105`	`3105`
`3106`		`-appendStringInfoString(buf,"\n TRANSFORM ");`
	`3106`	`+appendStringInfoString(buf," TRANSFORM ");`
`3107`	`3107`	`for (i=0;i<ntypes;i++)`
`3108`	`3108`	`{`
`3109`	`3109`	`if (i!=0)`
`3110`	`3110`	`appendStringInfoString(buf,", ");`
`3111`	`3111`	`appendStringInfo(buf,"FOR TYPE %s",format_type_be(trftypes[i]));`
`3112`	`3112`	`}`
	`3113`	`+appendStringInfoChar(buf,'\n');`
`3113`	`3114`	`}`
`3114`	`3115`	`}`
`3115`	`3116`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,9 @@ get_func_arg_info(HeapTuple procTup,`
`972`	`972`	`/*`
`973`	`973`	`* get_func_trftypes`
`974`	`974`	`*`
`975`		`- * Returns the number of transformed types used by function.`
	`975`	`+ * Returns the number of transformed types used by the function.`
	`976`	`+ * If there are any, a palloc'd array of the type OIDs is returned`
	`977`	`+ * into *p_trftypes.`
`976`	`978`	`*/`
`977`	`979`	`int`
`978`	`980`	`get_func_trftypes(HeapTupleprocTup,`
`@@ -1001,7 +1003,6 @@ get_func_trftypes(HeapTuple procTup,`
`1001`	`1003`	`ARR_HASNULL(arr)\|\|`
`1002`	`1004`	`ARR_ELEMTYPE(arr)!=OIDOID)`
`1003`	`1005`	`elog(ERROR,"protrftypes is not a 1-D Oid array");`
`1004`		`-Assert(nelems >= ((Form_pg_proc)GETSTRUCT(procTup))->pronargs);`
`1005`	`1006`	`p_trftypes= (Oid)palloc(nelems*sizeof(Oid));`
`1006`	`1007`	`memcpy(*p_trftypes,ARR_DATA_PTR(arr),`
`1007`	`1008`	`nelems*sizeof(Oid));`

Comments

(0)