mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add SPI_push/SPI_pop calls so that datatype input and output functions called

Browse Source 
by plpgsql can themselves use SPI --- possibly indirectly, as in the case
of domain_in() invoking plpgsql functions in a domain check constraint.
Per bug #2945 from Sergiy Vyshnevetskiy.

Somewhat arbitrarily, I've chosen to back-patch this as far as 8.0.  Given
the lack of prior complaints, it doesn't seem critical for 7.x.
This commit is contained in:
Tom Lane 2007-01-30 18:02:28 +00:00
parent c22f642f2f
commit 971230dfbb
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pl/plpgsql/src/pl_exec.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.1 2007/01/28 16:15:58 tgl Exp $ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.180.2.2 2007/01/30 18:02:28 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4239,12 +4239,27 @@ make_tuple_from_row(PLpgSQL_execstate *estate,
static char * static char *
convert_value_to_string(Datum value, Oid valtype) convert_value_to_string(Datum value, Oid valtype)
{ {
char *str;
Oid typoutput; Oid typoutput;
bool typIsVarlena; bool typIsVarlena;
getTypeOutputInfo(valtype, &typoutput, &typIsVarlena); getTypeOutputInfo(valtype, &typoutput, &typIsVarlena);
return OidOutputFunctionCall(typoutput, value); /*
* We do SPI_push to allow the datatype output function to use SPI.
* However we do not mess around with CommandCounterIncrement or advancing
* the snapshot, which means that a stable output function would not see
* updates made so far by our own function. The use-case for such
* scenarios seems too narrow to justify the cycles that would be
* expended.
*/
SPI_push();
str = OidOutputFunctionCall(typoutput, value);
SPI_pop();
return str;
} }
/* ---------- /* ----------
@ -4270,14 +4285,25 @@ exec_cast_value(Datum value, Oid valtype,
char *extval; char *extval;
extval = convert_value_to_string(value, valtype); extval = convert_value_to_string(value, valtype);
/* Allow input function to use SPI ... see notes above */
SPI_push();
value = InputFunctionCall(reqinput, extval, value = InputFunctionCall(reqinput, extval,
reqtypioparam, reqtypmod); reqtypioparam, reqtypmod);
SPI_pop();
pfree(extval); pfree(extval);
} }
else else
{ {
SPI_push();
value = InputFunctionCall(reqinput, NULL, value = InputFunctionCall(reqinput, NULL,
reqtypioparam, reqtypmod); reqtypioparam, reqtypmod);
SPI_pop();
} }
} }