8
8
*
9
9
*
10
10
* IDENTIFICATION
11
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.52 2000/02/15 03:37:47 thomas Exp $
11
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.53 2000/02/15 07:47:37 tgl Exp $
12
12
*
13
13
*-------------------------------------------------------------------------
14
14
*/
@@ -198,15 +198,11 @@ makeUniqueAttrList(List *attrs, List *filter)
198
198
{
199
199
List * fmember ;
200
200
bool match = FALSE;
201
- // char *field;
202
201
Attr * cattr = lfirst (candidate );
203
202
204
203
Assert (IsA (cattr , Attr ));
205
204
Assert (length (cattr -> attrs ) == 1 );
206
205
207
- // field = strVal(lfirst(ccol));
208
- // bool match = FALSE;
209
-
210
206
foreach (fmember , filter )
211
207
{
212
208
Attr * fattr = lfirst (fmember );
@@ -438,10 +434,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
438
434
static void
439
435
parseFromClause (ParseState * pstate , List * frmList )
440
436
{
441
- // List *shape, *alias;
442
- // Node **qual;
443
- // char *lname, *rname;
444
-
445
437
List * fl ;
446
438
447
439
foreach (fl , frmList )
@@ -470,9 +462,8 @@ parseFromClause(ParseState *pstate, List *frmList)
470
462
else if (IsA (n , JoinExpr ))
471
463
{
472
464
#ifndef DISABLE_JOIN_SYNTAX
473
- // char *lname, *rname;
474
465
RangeTblEntry * l_rte , * r_rte ;
475
- Attr * l_name , * r_name ;
466
+ Attr * l_name , * r_name = NULL ;
476
467
JoinExpr * j = (JoinExpr * ) n ;
477
468
478
469
if (j -> alias != NULL )
@@ -493,7 +484,6 @@ parseFromClause(ParseState *pstate, List *frmList)
493
484
494
485
if (IsA (j -> rarg , JoinExpr ))
495
486
{
496
- // elog(ERROR, "Nested JOINs are not yet supported");
497
487
parseFromClause (pstate , lcons (j -> rarg , NIL ));
498
488
l_name = ((JoinExpr * )j -> larg )-> alias ;
499
489
}
@@ -525,7 +515,6 @@ parseFromClause(ParseState *pstate, List *frmList)
525
515
Value * r_col = lfirst (rx );
526
516
Assert (IsA (r_col , String ));
527
517
528
- // if (equal(l_col, r_col))
529
518
if (strcmp (strVal (l_col ), strVal (r_col )) == 0 )
530
519
{
531
520
id = (Ident * ) makeNode (Ident );
@@ -564,7 +553,6 @@ parseFromClause(ParseState *pstate, List *frmList)
564
553
* List of Ident nodes means column names from a real USING
565
554
* clause. Determine the shape of the joined table.
566
555
*/
567
- // List *ltable, *rtable;
568
556
List * ucols , * ucol ;
569
557
List * shape = NULL ;
570
558
List * alias = NULL ;
0 commit comments