From d64713df7e5996ab3ab337b5e0901cf2c53773f9 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 12 Apr 2011 19:19:24 -0400 Subject: Pass collations to functions in FunctionCallInfoData, not FmgrInfo. Since collation is effectively an argument, not a property of the function, FmgrInfo is really the wrong place for it; and this becomes critical in cases where a cached FmgrInfo is used for varying purposes that might need different collation settings. Fix by passing it in FunctionCallInfoData instead. In particular this allows a clean fix for bug #5970 (record_cmp not working). This requires touching a bit more code than the original method, but nobody ever thought that collations would not be an invasive patch... --- src/backend/commands/trigger.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/backend/commands/trigger.c') diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c index 6b1ade89903..ce36ea8be45 100644 --- a/src/backend/commands/trigger.c +++ b/src/backend/commands/trigger.c @@ -1822,7 +1822,8 @@ ExecCallTriggerFunc(TriggerData *trigdata, /* * Call the function, passing no arguments but setting a context. */ - InitFunctionCallInfoData(fcinfo, finfo, 0, (Node *) trigdata, NULL); + InitFunctionCallInfoData(fcinfo, finfo, 0, + InvalidOid, (Node *) trigdata, NULL); pgstat_init_function_usage(&fcinfo, &fcusage); -- cgit v1.2.3