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/backend/executor/functions.c | |
| parent | 88543ecfec9c754b5f14b898bccbc68d941748b3 (diff) | |
| download | postgresql-d64713df7e5996ab3ab337b5e0901cf2c53773f9.tar.gz postgresql-d64713df7e5996ab3ab337b5e0901cf2c53773f9.zip | |
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/backend/executor/functions.c')
| -rw-r--r-- | src/backend/executor/functions.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 9c867bbae20..13946cab23d 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -127,7 +127,7 @@ static Node *sql_fn_param_ref(ParseState *pstate, ParamRef *pref); static List *init_execution_state(List *queryTree_list, SQLFunctionCachePtr fcache, bool lazyEvalOK); -static void init_sql_fcache(FmgrInfo *finfo, bool lazyEvalOK); +static void init_sql_fcache(FmgrInfo *finfo, Oid collation, bool lazyEvalOK); static void postquel_start(execution_state *es, SQLFunctionCachePtr fcache); static bool postquel_getnext(execution_state *es, SQLFunctionCachePtr fcache); static void postquel_end(execution_state *es); @@ -363,7 +363,7 @@ init_execution_state(List *queryTree_list, * Initialize the SQLFunctionCache for a SQL function */ static void -init_sql_fcache(FmgrInfo *finfo, bool lazyEvalOK) +init_sql_fcache(FmgrInfo *finfo, Oid collation, bool lazyEvalOK) { Oid foid = finfo->fn_oid; Oid rettype; @@ -428,7 +428,7 @@ init_sql_fcache(FmgrInfo *finfo, bool lazyEvalOK) */ fcache->pinfo = prepare_sql_fn_parse_info(procedureTuple, finfo->fn_expr, - finfo->fn_collation); + collation); /* * And of course we need the function body text. @@ -798,7 +798,7 @@ fmgr_sql(PG_FUNCTION_ARGS) fcache = (SQLFunctionCachePtr) fcinfo->flinfo->fn_extra; if (fcache == NULL) { - init_sql_fcache(fcinfo->flinfo, lazyEvalOK); + init_sql_fcache(fcinfo->flinfo, PG_GET_COLLATION(), lazyEvalOK); fcache = (SQLFunctionCachePtr) fcinfo->flinfo->fn_extra; } eslist = fcache->func_state; |