diff options
| author | Tom Lane | 2002-03-21 16:02:16 +0000 |
|---|---|---|
| committer | Tom Lane | 2002-03-21 16:02:16 +0000 |
| commit | 95ef6a344821655ce4d0a74999ac49dd6af6d342 (patch) | |
| tree | df484a4c9dde9827894ab707917c001a1f376749 /src/include/parser | |
| parent | 8c9c8ca2b57e4edef218245ccdc9eef7c06425d8 (diff) | |
First phase of SCHEMA changes, concentrating on fixing the grammar and
the parsetree representation. As yet we don't *do* anything with schema
names, just drop 'em on the floor; but you can enter schema-compatible
command syntax, and there's even a primitive CREATE SCHEMA command.
No doc updates yet, except to note that you can now extract a field
from a function-returning-row's result with (foo(...)).fieldname.
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/analyze.h | 3 | ||||
| -rw-r--r-- | src/include/parser/parse_agg.h | 5 | ||||
| -rw-r--r-- | src/include/parser/parse_expr.h | 7 | ||||
| -rw-r--r-- | src/include/parser/parse_func.h | 7 | ||||
| -rw-r--r-- | src/include/parser/parse_relation.h | 8 |
5 files changed, 13 insertions, 17 deletions
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h index 09cdde3786e..7d520eef5c3 100644 --- a/src/include/parser/analyze.h +++ b/src/include/parser/analyze.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: analyze.h,v 1.18 2001/11/05 17:46:34 momjian Exp $ + * $Id: analyze.h,v 1.19 2002/03/21 16:01:53 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -16,6 +16,7 @@ #include "parser/parse_node.h" extern List *parse_analyze(Node *parseTree, ParseState *parentParseState); +extern List *analyzeCreateSchemaStmt(CreateSchemaStmt *stmt); extern void CheckSelectForUpdate(Query *qry); diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 22d046e48fc..666e4ede764 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.20 2001/11/05 17:46:34 momjian Exp $ + * $Id: parse_agg.h,v 1.21 2002/03/21 16:01:55 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -19,8 +19,7 @@ extern void AddAggToParseState(ParseState *pstate, Aggref *aggref); extern void parseCheckAggregates(ParseState *pstate, Query *qry, Node *qual); extern Aggref *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, - List *args, bool agg_star, bool agg_distinct, - int precedence); + List *args, bool agg_star, bool agg_distinct); extern void agg_error(char *caller, char *aggname, Oid basetypeID); #endif /* PARSE_AGG_H */ diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h index 6c906420de7..e330f8c249a 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.25 2001/11/05 17:46:34 momjian Exp $ + * $Id: parse_expr.h,v 1.26 2002/03/21 16:01:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,12 @@ #include "parser/parse_node.h" -#define EXPR_COLUMN_FIRST 1 -#define EXPR_RELATION_FIRST 2 +/* GUC parameters */ extern int max_expr_depth; extern bool Transform_null_equals; -extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence); +extern Node *transformExpr(ParseState *pstate, Node *expr); extern Oid exprType(Node *expr); extern int32 exprTypmod(Node *expr); extern bool exprIsLengthCoercion(Node *expr, int32 *coercedTypmod); diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index ff70080f217..603ea9369c6 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.35 2001/11/05 17:46:35 momjian Exp $ + * $Id: parse_func.h,v 1.36 2002/03/21 16:02:01 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -47,12 +47,9 @@ typedef enum } FuncDetailCode; -extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, - int precedence); extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, - bool agg_star, bool agg_distinct, - int precedence); + bool agg_star, bool agg_distinct, bool is_column); extern FuncDetailCode func_get_detail(char *funcname, List *fargs, int nargs, Oid *argtypes, diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 1b579850f4e..656c70a688a 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.29 2002/03/12 00:52:04 tgl Exp $ + * $Id: parse_relation.h,v 1.30 2002/03/21 16:02:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -29,12 +29,12 @@ extern Node *qualifiedNameToVar(ParseState *pstate, char *refname, char *colname, bool implicitRTEOK); extern RangeTblEntry *addRangeTableEntry(ParseState *pstate, char *relname, - Attr *alias, + Alias *alias, bool inh, bool inFromCl); extern RangeTblEntry *addRangeTableEntryForSubquery(ParseState *pstate, Query *subquery, - Attr *alias, + Alias *alias, bool inFromCl); extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate, List *colnames, @@ -43,7 +43,7 @@ extern RangeTblEntry *addRangeTableEntryForJoin(ParseState *pstate, List *coltypmods, List *leftcols, List *rightcols, - Attr *alias, + Alias *alias, bool inFromCl); extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte, bool addToJoinList, bool addToNameSpace); |
