diff options
Diffstat (limited to 'src/include/nodes')
| -rw-r--r-- | src/include/nodes/makefuncs.h | 5 | ||||
| -rw-r--r-- | src/include/nodes/parsenodes.h | 18 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h index 2b3c5339c6..f934eb5e63 100644 --- a/src/include/nodes/makefuncs.h +++ b/src/include/nodes/makefuncs.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: makefuncs.h,v 1.22 2000/01/26 05:58:16 momjian Exp $ + * $Id: makefuncs.h,v 1.23 2000/02/15 03:38:13 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -46,4 +46,7 @@ extern Const *makeConst(Oid consttype, bool constisset, bool constiscast); +extern Attr * +makeAttr(char *relname, char *attname); + #endif /* MAKEFUNC_H */ diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 288e7f96b8..6eb47618c5 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parsenodes.h,v 1.97 2000/01/27 18:11:44 tgl Exp $ + * $Id: parsenodes.h,v 1.98 2000/02/15 03:38:14 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -1031,7 +1031,7 @@ typedef struct RangeVar { NodeTag type; RelExpr *relExpr; /* the relation expression */ - char *name; /* the name to be referenced (optional) */ + Attr *name; /* the name to be referenced (optional) */ } RangeVar; /* @@ -1064,9 +1064,11 @@ typedef struct JoinExpr { NodeTag type; int jointype; - RangeVar *larg; - Node *rarg; - List *quals; + bool isNatural; /* Natural join? Will need to shape table */ + Node *larg; /* RangeVar or join expression */ + Node *rarg; /* RangeVar or join expression */ + Attr *alias; /* table and column aliases, if any */ + List *quals; /* qualifiers on join, if any */ } JoinExpr; @@ -1122,8 +1124,10 @@ typedef struct RangeTblEntry { NodeTag type; char *relname; /* real name of the relation */ - char *refname; /* the reference name (as specified in the - * FROM clause) */ +// char *refname; /* reference name (given in FROM clause) */ +#ifndef DISABLE_JOIN_SYNTAX + Attr *ref; /* reference names (given in FROM clause) */ +#endif Oid relid; /* OID of the relation */ bool inh; /* inheritance requested? */ bool inFromCl; /* present in FROM clause */ |