From a1bde80db45fe9f123abb2a493b9dfcb755d427d Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 19 Aug 2010 18:11:02 +0000 Subject: [PATCH] Keep exec_simple_check_plan() from thinking "SELECT foo INTO bar" is simple. 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. --- src/pl/plpgsql/src/pl_exec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 04067c176ea..8d0c62559b6 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.244.2.9 2010/08/19 17:31:56 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.244.2.10 2010/08/19 18:11:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -5148,6 +5148,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;