Keep exec_simple_check_plan() from thinking "SELECT foo INTO bar" is simple.

tglsfdc · tglsfdc · commit f5c496b7f55f · 2010-08-19T18:10:56.000Z
It's not clear if this situation can occur in plpgsql other than via the
EXECUTE USING case Heikki illustrated, which I will shortly close off.
However, ignoring the intoClause if it's there is surely wrong, so let's
patch it for safety.

Backpatch to 8.3, which is as far back as this code has a PlannedStmt
to deal with.  There might be another way to make an equivalent test
before that, but since this is just preventing hypothetical bugs,
I'm not going to obsess about it.
diff --git 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.261.2.3 2010/08/19 17:31:50 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.261.2.4 2010/08/19 18:10:56 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -5272,6 +5272,8 @@ exec_simple_check_plan(PLpgSQL_expr *expr)
 	 */
 	if (!IsA(stmt, PlannedStmt))
 		return;
+	if (stmt->commandType != CMD_SELECT || stmt->intoClause)
+		return;
 	plan = stmt->planTree;
 	if (!IsA(plan, Result))
 		return;

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/pl/plpgsql/src/pl_exec.c,v 1.261.2.3 2010/08/19 17:31:50 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.261.2.4 2010/08/19 18:10:56 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -5272,6 +5272,8 @@ exec_simple_check_plan(PLpgSQL_expr *expr)`
`5272`	`5272`	`*/`
`5273`	`5273`	`if (!IsA(stmt, PlannedStmt))`
`5274`	`5274`	`return;`
	`5275`	`+ if (stmt->commandType != CMD_SELECT \|\| stmt->intoClause)`
	`5276`	`+ return;`
`5275`	`5277`	`plan = stmt->planTree;`
`5276`	`5278`	`if (!IsA(plan, Result))`
`5277`	`5279`	`return;`