When executing a list of queries derived from rule expansion,

tglsfdc · tglsfdc · commit 29fa05131611 · 2006-08-14T13:40:18.000Z
_SPI_execute_plan's return code should reflect the type of the query
that is marked canSetTag, not necessarily the last one in the list.

This is arguably a bug fix, but I'm hesitant to back-patch it because
it's the sort of subtle change that might break someone's code, and it's
best not to do that kind of thing in point releases.
diff --git 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.155 2006/08/12 20:05:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.156 2006/08/14 13:40:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1306,7 +1306,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 				  Snapshot snapshot, Snapshot crosscheck_snapshot,
 				  bool read_only, long tcount)
 {
-	volatile int res = 0;
+	volatile int my_res = 0;
 	volatile uint32 my_processed = 0;
 	volatile Oid my_lastoid = InvalidOid;
 	SPITupleTable *volatile my_tuptable = NULL;
@@ -1364,6 +1364,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 				Plan	   *planTree;
 				QueryDesc  *qdesc;
 				DestReceiver *dest;
+				int			res;
 
 				planTree = lfirst(plan_list_item);
 				plan_list_item = lnext(plan_list_item);
@@ -1380,20 +1381,20 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 
 						if (stmt->filename == NULL)
 						{
-							res = SPI_ERROR_COPY;
+							my_res = SPI_ERROR_COPY;
 							goto fail;
 						}
 					}
 					else if (IsA(queryTree->utilityStmt, DeclareCursorStmt) ||
 							 IsA(queryTree->utilityStmt, ClosePortalStmt) ||
 							 IsA(queryTree->utilityStmt, FetchStmt))
 					{
-						res = SPI_ERROR_CURSOR;
+						my_res = SPI_ERROR_CURSOR;
 						goto fail;
 					}
 					else if (IsA(queryTree->utilityStmt, TransactionStmt))
 					{
-						res = SPI_ERROR_TRANSACTION;
+						my_res = SPI_ERROR_TRANSACTION;
 						goto fail;
 					}
 				}
@@ -1459,7 +1460,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 				ActiveSnapshot = NULL;
 
 				/*
-				 * The last canSetTag query sets the auxiliary values returned
+				 * The last canSetTag query sets the status values returned
 				 * to the caller.  Be careful to free any tuptables not
 				 * returned, to avoid intratransaction memory leak.
 				 */
@@ -1469,6 +1470,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 					my_lastoid = _SPI_current->lastoid;
 					SPI_freetuptable(my_tuptable);
 					my_tuptable = _SPI_current->tuptable;
+					my_res = res;
 				}
 				else
 				{
@@ -1477,7 +1479,10 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 				}
 				/* we know that the receiver doesn't need a destroy call */
 				if (res < 0)
+				{
+					my_res = res;
 					goto fail;
+				}
 			}
 		}
 
@@ -1503,7 +1508,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, const char *Nulls,
 	SPI_lastoid = my_lastoid;
 	SPI_tuptable = my_tuptable;
 
-	return res;
+	return my_res;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.155 2006/08/12 20:05:55 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/spi.c,v 1.156 2006/08/14 13:40:18 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1306,7 +1306,7 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1306`	`1306`	`Snapshot snapshot, Snapshot crosscheck_snapshot,`
`1307`	`1307`	`bool read_only, long tcount)`
`1308`	`1308`	`{`
`1309`		`- volatile int res = 0;`
	`1309`	`+ volatile int my_res = 0;`
`1310`	`1310`	`volatile uint32 my_processed = 0;`
`1311`	`1311`	`volatile Oid my_lastoid = InvalidOid;`
`1312`	`1312`	`SPITupleTable *volatile my_tuptable = NULL;`
`@@ -1364,6 +1364,7 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1364`	`1364`	`Plan *planTree;`
`1365`	`1365`	`QueryDesc *qdesc;`
`1366`	`1366`	`DestReceiver *dest;`
	`1367`	`+ int res;`
`1367`	`1368`
`1368`	`1369`	`planTree = lfirst(plan_list_item);`
`1369`	`1370`	`plan_list_item = lnext(plan_list_item);`
`@@ -1380,20 +1381,20 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1380`	`1381`
`1381`	`1382`	`if (stmt->filename == NULL)`
`1382`	`1383`	`{`
`1383`		`- res = SPI_ERROR_COPY;`
	`1384`	`+ my_res = SPI_ERROR_COPY;`
`1384`	`1385`	`goto fail;`
`1385`	`1386`	`}`
`1386`	`1387`	`}`
`1387`	`1388`	`else if (IsA(queryTree->utilityStmt, DeclareCursorStmt) \|\|`
`1388`	`1389`	`IsA(queryTree->utilityStmt, ClosePortalStmt) \|\|`
`1389`	`1390`	`IsA(queryTree->utilityStmt, FetchStmt))`
`1390`	`1391`	`{`
`1391`		`- res = SPI_ERROR_CURSOR;`
	`1392`	`+ my_res = SPI_ERROR_CURSOR;`
`1392`	`1393`	`goto fail;`
`1393`	`1394`	`}`
`1394`	`1395`	`else if (IsA(queryTree->utilityStmt, TransactionStmt))`
`1395`	`1396`	`{`
`1396`		`- res = SPI_ERROR_TRANSACTION;`
	`1397`	`+ my_res = SPI_ERROR_TRANSACTION;`
`1397`	`1398`	`goto fail;`
`1398`	`1399`	`}`
`1399`	`1400`	`}`
`@@ -1459,7 +1460,7 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1459`	`1460`	`ActiveSnapshot = NULL;`
`1460`	`1461`
`1461`	`1462`	`/*`
`1462`		`- * The last canSetTag query sets the auxiliary values returned`
	`1463`	`+ * The last canSetTag query sets the status values returned`
`1463`	`1464`	`* to the caller. Be careful to free any tuptables not`
`1464`	`1465`	`* returned, to avoid intratransaction memory leak.`
`1465`	`1466`	`*/`
`@@ -1469,6 +1470,7 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1469`	`1470`	`my_lastoid = _SPI_current->lastoid;`
`1470`	`1471`	`SPI_freetuptable(my_tuptable);`
`1471`	`1472`	`my_tuptable = _SPI_current->tuptable;`
	`1473`	`+ my_res = res;`
`1472`	`1474`	`}`
`1473`	`1475`	`else`
`1474`	`1476`	`{`
`@@ -1477,7 +1479,10 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1477`	`1479`	`}`
`1478`	`1480`	`/* we know that the receiver doesn't need a destroy call */`
`1479`	`1481`	`if (res < 0)`
	`1482`	`+ {`
	`1483`	`+ my_res = res;`
`1480`	`1484`	`goto fail;`
	`1485`	`+ }`
`1481`	`1486`	`}`
`1482`	`1487`	`}`
`1483`	`1488`
`@@ -1503,7 +1508,7 @@ _SPI_execute_plan(_SPI_plan plan, Datum Values, const char *Nulls,`
`1503`	`1508`	`SPI_lastoid = my_lastoid;`
`1504`	`1509`	`SPI_tuptable = my_tuptable;`
`1505`	`1510`
`1506`		`- return res;`
	`1511`	`+ return my_res;`
`1507`	`1512`	`}`
`1508`	`1513`
`1509`	`1514`	`static int`