aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>1999-04-26 00:37:46 +0000
committerTom Lane <tgl@sss.pgh.pa.us>1999-04-26 00:37:46 +0000
commiteb00bdf2374d758fe753e5370720631a458081f4 (patch)
treeb8ba5924f7869ebeff1583ac3d536943a8cfae81 /src
parent26db818710f3e62234cfee0324046a33bc101392 (diff)
downloadpostgresql-eb00bdf2374d758fe753e5370720631a458081f4.tar.gz
postgresql-eb00bdf2374d758fe753e5370720631a458081f4.zip
Insert a test for missing targetlist entry in replace_agg_clause.
Diffstat (limited to 'src')
-rw-r--r--src/backend/optimizer/plan/setrefs.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index 53ebd8c34dd..3584cda1535 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.41 1999/04/19 01:43:12 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/setrefs.c,v 1.42 1999/04/26 00:37:46 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -599,9 +599,11 @@ replace_result_clause(Node *clause,
*/
subplanVar = match_varid((Var *) clause, subplanTargetList);
+ if (! subplanVar)
+ elog(ERROR, "replace_result_clause: variable not in target list");
+
/*
* Change the varno & varattno fields of the var node.
- *
*/
((Var *) clause)->varno = (Index) OUTER;
((Var *) clause)->varattno = subplanVar->resdom->resno;
@@ -754,10 +756,11 @@ replace_agg_clause(Node *clause, List *subplanTargetList)
*/
subplanVar = match_varid((Var *) clause, subplanTargetList);
+ if (! subplanVar)
+ elog(ERROR, "replace_agg_clause: variable not in target list");
+
/*
* Change the varno & varattno fields of the var node.
- * Note we assume match_varid() will succeed ...
- *
*/
((Var *) clause)->varattno = subplanVar->resdom->resno;