88 *
99 *
1010 * IDENTIFICATION
11- * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.52 2000/02/1503:37:47 thomas Exp $
11+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.53 2000/02/1507:47:37 tgl Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
@@ -198,15 +198,11 @@ makeUniqueAttrList(List *attrs, List *filter)
198198{
199199List * fmember ;
200200bool match = FALSE;
201- //char *field;
202201Attr * cattr = lfirst (candidate );
203202
204203Assert (IsA (cattr ,Attr ));
205204Assert (length (cattr -> attrs )== 1 );
206205
207- //field = strVal(lfirst(ccol));
208- //bool match = FALSE;
209-
210206foreach (fmember ,filter )
211207{
212208Attr * fattr = lfirst (fmember );
@@ -438,10 +434,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
438434static void
439435parseFromClause (ParseState * pstate ,List * frmList )
440436{
441- //List *shape, *alias;
442- //Node **qual;
443- //char *lname, *rname;
444-
445437List * fl ;
446438
447439foreach (fl ,frmList )
@@ -470,9 +462,8 @@ parseFromClause(ParseState *pstate, List *frmList)
470462else if (IsA (n ,JoinExpr ))
471463{
472464#ifndef DISABLE_JOIN_SYNTAX
473- //char *lname, *rname;
474465RangeTblEntry * l_rte ,* r_rte ;
475- Attr * l_name ,* r_name ;
466+ Attr * l_name ,* r_name = NULL ;
476467JoinExpr * j = (JoinExpr * )n ;
477468
478469if (j -> alias != NULL )
@@ -493,7 +484,6 @@ parseFromClause(ParseState *pstate, List *frmList)
493484
494485if (IsA (j -> rarg ,JoinExpr ))
495486{
496- //elog(ERROR, "Nested JOINs are not yet supported");
497487parseFromClause (pstate ,lcons (j -> rarg ,NIL ));
498488l_name = ((JoinExpr * )j -> larg )-> alias ;
499489}
@@ -525,7 +515,6 @@ parseFromClause(ParseState *pstate, List *frmList)
525515Value * r_col = lfirst (rx );
526516Assert (IsA (r_col ,String ));
527517
528- //if (equal(l_col, r_col))
529518if (strcmp (strVal (l_col ),strVal (r_col ))== 0 )
530519{
531520id = (Ident * )makeNode (Ident );
@@ -564,7 +553,6 @@ parseFromClause(ParseState *pstate, List *frmList)
564553 * List of Ident nodes means column names from a real USING
565554 * clause. Determine the shape of the joined table.
566555 */
567- //List *ltable, *rtable;
568556List * ucols ,* ucol ;
569557List * shape = NULL ;
570558List * alias = NULL ;