Define JoinExpr structure for outer join syntax.

Clean up comments in execnodes.h.

diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 8b0913493f040c30ac9f993d5de9cbffba9dfdc6..709a0a54c9077cadb45f178e6eec97a7e1bd4bc0 100644 (file)
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -607,7 +607,7 @@ typedef struct GroupState
  *      SortState information
  *
  *|            sort nodes are really just a kind of a scan since
- *|            we implement sorts by retrieveing the entire subplan
+ *|            we implement sorts by retrieving the entire subplan
  *|            into a temp relation, sorting the temp relation into
  *|            another sorted relation, and then preforming a simple
  *|            unqualified sequential scan on the sorted relation..

diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 4f4186c5820bafd46218c92da781c0e98d8a938a..5cee2b6b17aec7d9c30af46aa39afd35927d6249 100644 (file)
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -215,7 +215,7 @@ typedef enum NodeTag
        T_SortClause,
        T_GroupClause,
        T_SubSelect,
-       T_JoinUsing,
+       T_JoinExpr,
        T_CaseExpr,
        T_CaseWhen,
        T_RowMark

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 1ffa96b3ef2c5599bdb3abaad4bd6c82fe111d33..5bfe5832d10b56bebba416564d4b85f383f2e24f 100644 (file)
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -149,7 +149,7 @@ typedef struct CreateStmt
 
 typedef enum ConstrType                        /* type of constaints */
 {
-       CONSTR_NONE, CONSTR_NOTNULL, CONSTR_DEFAULT, CONSTR_CHECK, CONSTR_PRIMARY, CONSTR_UNIQUE
+       CONSTR_NULL, CONSTR_NOTNULL, CONSTR_DEFAULT, CONSTR_CHECK, CONSTR_PRIMARY, CONSTR_UNIQUE
 } ConstrType;
 
 typedef struct Constraint
@@ -671,7 +671,6 @@ typedef struct SelectStmt
        List       *forUpdate;          /* FOR UPDATE clause */
 } SelectStmt;
 
-
 /****************************************************************************
  *     Supporting data structures for Parse Trees
  ****************************************************************************/
@@ -854,17 +853,6 @@ typedef struct SortGroupBy
        Node       *node;                       /* Expression  */
 } SortGroupBy;
 
-/*
- * JoinUsing - for JOIN USING clause
- */
-typedef struct JoinUsing
-{
-       NodeTag         type;
-       int                     resno;                  /* target number */
-       char       *range;
-       char       *name;                       /* name of column to sort on */
-}                      JoinUsing;
-
 /*
  * RangeVar - range variable, used in FROM clauses
  */
@@ -898,6 +886,18 @@ typedef struct DefElem
        Node       *arg;                        /* a (Value *) or a (TypeName *) */
 } DefElem;
 
+/*
+ * JoinExpr - for JOIN expressions
+ */
+typedef struct JoinExpr
+{
+       NodeTag         type;
+       int                     jointype;
+       RangeVar   *larg;
+       Node       *rarg;
+       List       *quals;
+} JoinExpr;
+
 
 /****************************************************************************
  *     Nodes for a Query tree