From: Tom Lane Date: Thu, 19 Aug 2010 17:31:43 +0000 (+0000) Subject: Be a bit less cavalier with both the code and the comment for UNKNOWN fix. X-Git-Tag: REL9_1_ALPHA1~58 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3869e9aecbe11fe04b6db4f0da1ace1e0eb7cdd2;p=postgresql Be a bit less cavalier with both the code and the comment for UNKNOWN fix. --- diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index b19db02e28..223eaf9db5 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.264 2010/08/19 16:54:43 heikki Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.265 2010/08/19 17:31:43 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -5524,14 +5524,16 @@ exec_eval_using_params(PLpgSQL_execstate *estate, List *params) if (ppd->types[i] == UNKNOWNOID) { /* - * Treat 'unknown' parameters as text, that's what most people - * would expect. The backend can coerce unknown constants in a - * more intelligent way, but not unknown Params. + * Treat 'unknown' parameters as text, since that's what most + * people would expect. SPI_execute_with_args can coerce unknown + * constants in a more intelligent way, but not unknown Params. + * This code also takes care of copying into the right context. + * Note we assume 'unknown' has the representation of C-string. */ ppd->types[i] = TEXTOID; if (!isnull) { - ppd->values[i] = CStringGetTextDatum((char *) ppd->values[i]); + ppd->values[i] = CStringGetTextDatum(DatumGetCString(ppd->values[i])); ppd->freevals[i] = true; } }