diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/executor/spi.c | 11 | ||||
| -rw-r--r-- | src/include/executor/spi.h | 3 | ||||
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 26 |
3 files changed, 25 insertions, 15 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c index aa562c2ea9a..f750560c6f4 100644 --- a/src/backend/executor/spi.c +++ b/src/backend/executor/spi.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.206 2009/01/07 20:38:56 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.207 2009/01/21 11:02:40 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -1490,6 +1490,8 @@ SPI_result_code_string(int code) return "SPI_OK_DELETE_RETURNING"; case SPI_OK_UPDATE_RETURNING: return "SPI_OK_UPDATE_RETURNING"; + case SPI_OK_REWRITTEN: + return "SPI_OK_REWRITTEN"; } /* Unrecognized code ... return something useful ... */ sprintf(buf, "Unrecognized SPI code %d", code); @@ -1910,11 +1912,12 @@ fail: _SPI_current->tuptable = NULL; /* - * If none of the queries had canSetTag, we return the last query's result - * code, but not its auxiliary results (for backwards compatibility). + * If none of the queries had canSetTag, return SPI_OK_REWRITTEN. Prior + * to 8.4, we used return the last query's result code, but not its + * auxiliary results, but that's confusing. */ if (my_res == 0) - my_res = res; + my_res = SPI_OK_REWRITTEN; return my_res; } diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h index 66a77ce4778..8b9fe32d7ba 100644 --- a/src/include/executor/spi.h +++ b/src/include/executor/spi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.70 2009/01/07 20:38:56 tgl Exp $ + * $PostgreSQL: pgsql/src/include/executor/spi.h,v 1.71 2009/01/21 11:02:40 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -56,6 +56,7 @@ typedef struct _SPI_plan *SPIPlanPtr; #define SPI_OK_INSERT_RETURNING 11 #define SPI_OK_DELETE_RETURNING 12 #define SPI_OK_UPDATE_RETURNING 13 +#define SPI_OK_REWRITTEN 14 extern PGDLLIMPORT uint32 SPI_processed; extern PGDLLIMPORT Oid SPI_lastoid; diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index fd7cce3aedd..7443c62feef 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.229 2009/01/14 09:53:51 heikki Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.230 2009/01/21 11:02:40 heikki Exp $ * *------------------------------------------------------------------------- */ @@ -2782,19 +2782,13 @@ exec_stmt_execsql(PLpgSQL_execstate *estate, /* * Check for error, and set FOUND if appropriate (for historical reasons - * we set FOUND only for certain query types). - * - * Note: the command type indicated by return code might not match - * mod_stmt, if there is an INSTEAD OF rule rewriting an UPDATE into an - * INSERT, for example. In that case, the INSERT doesn't have canSetTag - * set, mod_stmt is false, and SPI_execute_plan sets SPI_processed to - * zero. We'll set FOUND to false here in that case. If the statement is - * rewritten into a utility statement, however, FOUND is left unchanged. - * Arguably that's a bug, but changing it now could break applications. + * we set FOUND only for certain query types). Also Assert that we + * identified the statement type the same as SPI did. */ switch (rc) { case SPI_OK_SELECT: + Assert(!stmt->mod_stmt); exec_set_found(estate, (SPI_processed != 0)); break; @@ -2804,11 +2798,23 @@ exec_stmt_execsql(PLpgSQL_execstate *estate, case SPI_OK_INSERT_RETURNING: case SPI_OK_UPDATE_RETURNING: case SPI_OK_DELETE_RETURNING: + Assert(stmt->mod_stmt); exec_set_found(estate, (SPI_processed != 0)); break; case SPI_OK_SELINTO: case SPI_OK_UTILITY: + Assert(!stmt->mod_stmt); + break; + + case SPI_OK_REWRITTEN: + Assert(!stmt->mod_stmt); + /* + * The command was rewritten into another kind of command. It's + * not clear what FOUND would mean in that case (and SPI doesn't + * return the row count either), so just set it to false. + */ + exec_set_found(estate, false); break; default: |