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

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.

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index e08ecdf303078f640704ae6bc758888a66219a00..8f11b1e5d919a4b6b982934c4cf8e175b6023bc6 100644 (file)
--- 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.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 *
 convert_value_to_string(Datum value, Oid valtype)
 {
+       char       *str;
        Oid                     typoutput;
        bool            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;
 
                        extval = convert_value_to_string(value, valtype);
+
+                       /* Allow input function to use SPI ... see notes above */
+                       SPI_push();
+
                        value = InputFunctionCall(reqinput, extval,
                                                                          reqtypioparam, reqtypmod);
+
+                       SPI_pop();
+
                        pfree(extval);
                }
                else
                {
+                       SPI_push();
+
                        value = InputFunctionCall(reqinput, NULL,
                                                                          reqtypioparam, reqtypmod);
+
+                       SPI_pop();
                }
        }