88 *
99 *
1010 * IDENTIFICATION
11- * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.100 2003/03/2201:49:38 tgl Exp $
11+ * $Header: /cvsroot/pgsql/src/backend/optimizer/path/allpaths.c,v 1.101 2003/03/2217:11:25 tgl Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
@@ -638,7 +638,7 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
638638{
639639bool safe = true;
640640List * vars ;
641- List * l ;
641+ List * vl ;
642642Bitmapset * tested = NULL ;
643643
644644/* Refuse subselects (point 1) */
@@ -650,10 +650,11 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
650650 * all such Vars must refer to subselect output columns.
651651 */
652652vars = pull_var_clause (qual , false);
653- foreach (l ,vars )
653+ foreach (vl ,vars )
654654{
655- Var * var = (Var * )lfirst (l );
656- TargetEntry * tle ;
655+ Var * var = (Var * )lfirst (vl );
656+ List * tl ;
657+ TargetEntry * tle = NULL ;
657658
658659Assert (var -> varno == rti );
659660/*
@@ -665,8 +666,13 @@ qual_is_pushdown_safe(Query *subquery, Index rti, Node *qual)
665666continue ;
666667tested = bms_add_member (tested ,var -> varattno );
667668
668- tle = (TargetEntry * )nth (var -> varattno - 1 ,subquery -> targetList );
669- Assert (tle -> resdom -> resno == var -> varattno );
669+ foreach (tl ,subquery -> targetList )
670+ {
671+ tle = (TargetEntry * )lfirst (tl );
672+ if (tle -> resdom -> resno == var -> varattno )
673+ break ;
674+ }
675+ Assert (tl != NIL );
670676Assert (!tle -> resdom -> resjunk );
671677
672678/* If subquery uses DISTINCT or DISTINCT ON, check point 2 */