mirror of
https://github.com/postgres/postgres.git
synced 2025-11-22 12:22:45 +03:00
Fix handling of collation in SQL-language functions.
Ensure that parameter symbols receive collation from the function's resolved input collation, and fix inlining to behave properly. BTW, this commit lays about 90% of the infrastructure needed to support use of argument names in SQL functions. Parsing of parameters is now done via the parser-hook infrastructure ... we'd just need to supply a column-ref hook ...
This commit is contained in:
@@ -845,16 +845,21 @@ fmgr_sql_validator(PG_FUNCTION_ARGS)
|
||||
* OK to do full precheck: analyze and rewrite the queries,
|
||||
* then verify the result type.
|
||||
*/
|
||||
SQLFunctionParseInfoPtr pinfo;
|
||||
|
||||
/* But first, set up parameter information */
|
||||
pinfo = prepare_sql_fn_parse_info(tuple, NULL, InvalidOid);
|
||||
|
||||
querytree_list = NIL;
|
||||
foreach(lc, raw_parsetree_list)
|
||||
{
|
||||
Node *parsetree = (Node *) lfirst(lc);
|
||||
List *querytree_sublist;
|
||||
|
||||
querytree_sublist = pg_analyze_and_rewrite(parsetree,
|
||||
prosrc,
|
||||
proc->proargtypes.values,
|
||||
proc->pronargs);
|
||||
querytree_sublist = pg_analyze_and_rewrite_params(parsetree,
|
||||
prosrc,
|
||||
(ParserSetupHook) sql_fn_parser_setup,
|
||||
pinfo);
|
||||
querytree_list = list_concat(querytree_list,
|
||||
querytree_sublist);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user