Commit004f494

committed

Add collation assignment to CALL statement

Otherwise functions that require collation information will not haveit if they are called in arguments to a CALL statement.Reported-by: Jean-Marc Voillequin <Jean-Marc.Voillequin@moodys.com>Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://www.postgresql.org/message-id/flat/1EC8157EB499BF459A516ADCF135ADCE39FFAC54%40LON-WGMSX712.ad.moodys.net

1 parentd850af4 commit004f494Copy full SHA for 004f494

File tree

+20

-0

lines changed

+20

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2634,6 +2634,8 @@ transformCallStmt(ParseState pstate, CallStmt stmt)`
`2634`	`2634`	`true,`
`2635`	`2635`	`stmt->funccall->location);`
`2636`	`2636`
	`2637`	`+assign_expr_collations(pstate,node);`
	`2638`	`+`
`2637`	`2639`	`stmt->funcexpr=castNode(FuncExpr,node);`
`2638`	`2640`
`2639`	`2641`	`result=makeNode(Query);`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,13 @@ AS $$`
`139`	`139`	`SELECT NULL::int;`
`140`	`140`	`$$;`
`141`	`141`	`CALL ptest6(1, 2);`
	`142`	`+-- collation assignment`
	`143`	`+CREATE PROCEDURE ptest7(a text, b text)`
	`144`	`+LANGUAGE SQL`
	`145`	`+AS $$`
	`146`	`+SELECT a = b;`
	`147`	`+$$;`
	`148`	`+CALL ptest7(least('a', 'b'), 'a');`
`142`	`149`	`-- various error cases`
`143`	`150`	`CALL version(); -- error: not a procedure`
`144`	`151`	`ERROR: version() is not a procedure`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,17 @@ $$;`
`101`	`101`	`CALL ptest6(1,2);`
`102`	`102`
`103`	`103`
	`104`	`+-- collation assignment`
	`105`	`+`
	`106`	`+CREATE PROCEDURE ptest7(atext, btext)`
	`107`	`+LANGUAGE SQL`
	`108`	`+AS $$`
	`109`	`+SELECT a= b;`
	`110`	`+$$;`
	`111`	`+`
	`112`	`+CALL ptest7(least('a','b'),'a');`
	`113`	`+`
	`114`	`+`
`104`	`115`	`-- various error cases`
`105`	`116`
`106`	`117`	`CALL version();-- error: not a procedure`

Comments

(0)