diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-12 19:19:24 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2011-04-12 19:19:24 -0400 |
| commit | d64713df7e5996ab3ab337b5e0901cf2c53773f9 (patch) | |
| tree | 7105a61bf9fef5cef674cea7f1305dfeb77aa39a /src/pl | |
| parent | 88543ecfec9c754b5f14b898bccbc68d941748b3 (diff) | |
| download | postgresql-d64713df7e5996ab3ab337b5e0901cf2c53773f9.tar.gz | |
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...
Diffstat (limited to 'src/pl')
| -rw-r--r-- | src/pl/plpgsql/src/pl_comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c index 9f919b88c2..535fea9257 100644 --- a/src/pl/plpgsql/src/pl_comp.c +++ b/src/pl/plpgsql/src/pl_comp.c @@ -348,7 +348,7 @@ do_compile(FunctionCallInfo fcinfo, function->fn_xmin = HeapTupleHeaderGetXmin(procTup->t_data); function->fn_tid = procTup->t_self; function->fn_is_trigger = is_trigger; - function->fn_input_collation = fcinfo->flinfo->fn_collation; + function->fn_input_collation = fcinfo->fncollation; function->fn_cxt = func_cxt; function->out_param_varno = -1; /* set up for no OUT param */ function->resolve_option = plpgsql_variable_conflict; @@ -2331,7 +2331,7 @@ compute_function_hashkey(FunctionCallInfo fcinfo, } /* get input collation, if known */ - hashkey->inputCollation = fcinfo->flinfo->fn_collation; + hashkey->inputCollation = fcinfo->fncollation; if (procStruct->pronargs > 0) { |