diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-01-07 20:39:05 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-01-07 20:39:05 +0000 |
| commit | 323dd9f3203c49ebcea35a5b2f436e88e1a2039e (patch) | |
| tree | c21e87b0beb6ee520f06b29aff47724113da2f02 /src/include/executor/spi.h | |
| parent | 72a3bc4a1d578df0c51534c8bf7dc918ac6c8595 (diff) | |
| download | postgresql-323dd9f3203c49ebcea35a5b2f436e88e1a2039e.tar.gz postgresql-323dd9f3203c49ebcea35a5b2f436e88e1a2039e.zip | |
Insert conditional SPI_push/SPI_pop calls into InputFunctionCall,
OutputFunctionCall, and friends. This allows SPI-using functions to invoke
datatype I/O without concern for the possibility that a SPI-using function
will be called (which could be either the I/O function itself, or a function
used in a domain check constraint). It's a tad ugly, but not nearly as ugly
as what'd be needed to make this work via retail insertion of push/pop
operations in all the PLs.
This reverts my patch of 2007-01-30 that inserted some retail SPI_push/pop
calls into plpgsql; that approach only fixed plpgsql, and not any other PLs.
But the other PLs have the issue too, as illustrated by a recent gripe from
Christian Schröder.
Back-patch to 8.2, which is as far back as this solution will work. It's
also as far back as we need to worry about the domain-constraint case, since
earlier versions did not attempt to check domain constraints within datatype
input. I'm not aware of any old I/O functions that use SPI themselves, so
this should be sufficient for a back-patch.
Diffstat (limited to 'src/include/executor/spi.h')
| -rw-r--r-- | src/include/executor/spi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 32d9488a667..39644a93ce1 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.65.2.1 2008/09/15 23:37:49 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.65.2.2 2009/01/07 20:39:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -93,6 +93,8 @@ extern int SPI_connect(void); extern int SPI_finish(void); extern void SPI_push(void); extern void SPI_pop(void); +extern bool SPI_push_conditional(void); +extern void SPI_pop_conditional(bool pushed); extern void SPI_restore_connection(void); extern int SPI_execute(const char *src, bool read_only, long tcount); extern int SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls, |