Repair list-vs-node confusion that resulted in failure for INNER JOIN ON.

Make it behave correctly when there are more than two tables being
joined, also.  Update regression test expected outputs.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 583ce8ce6a4..d4231e8819d 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_node.h,v 1.19 2000/04/12 17:16:45 momjian Exp $
+ * $Id: parse_node.h,v 1.20 2000/05/12 01:33:52 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -17,9 +17,10 @@
 #include "utils/rel.h"
 
 /* State information used during parse analysis
- * p_join_quals is a list of qualification expressions
- * found in the FROM clause. Needs to be available later
- * to merge with other qualifiers from the WHERE clause.
+ * p_join_quals is a list of untransformed qualification expressions
+ * (implicitly ANDed together) found in the FROM clause.
+ * Needs to be available later to merge with other qualifiers from the
+ * WHERE clause.
  */
 typedef struct ParseState
 {
@@ -36,7 +37,7 @@ typedef struct ParseState
 	RangeTblEntry *p_target_rangetblentry;
 	List	   *p_shape;
 	List	   *p_alias;
-	Node	   *p_join_quals;
+	List	   *p_join_quals;
 } ParseState;
 
 extern ParseState *make_parsestate(ParseState *parentParseState);