diff options
Diffstat (limited to 'src/include/parser')
| -rw-r--r-- | src/include/parser/parse_agg.h | 5 | ||||
| -rw-r--r-- | src/include/parser/parse_expr.h | 5 | ||||
| -rw-r--r-- | src/include/parser/parse_func.h | 4 | ||||
| -rw-r--r-- | src/include/parser/parse_relation.h | 3 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h index 9761aa94e1..8d1e0fb31f 100644 --- a/src/include/parser/parse_agg.h +++ b/src/include/parser/parse_agg.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_agg.h,v 1.3 1997/11/26 03:43:08 momjian Exp $ + * $Id: parse_agg.h,v 1.4 1998/01/04 04:31:39 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ extern void AddAggToParseState(ParseState *pstate, Aggreg *aggreg); extern void finalizeAggregates(ParseState *pstate, Query *qry); extern void parseCheckAggregates(ParseState *pstate, Query *qry); -extern Aggreg *ParseAgg(char *aggname, Oid basetype, Node *target); +extern Aggreg *ParseAgg(ParseState *pstate, char *aggname, Oid basetype, + List *target, int precedence); 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 f26bf34acb..ba8eed9c81 100644 --- a/src/include/parser/parse_expr.h +++ b/src/include/parser/parse_expr.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_expr.h,v 1.3 1997/11/26 03:43:11 momjian Exp $ + * $Id: parse_expr.h,v 1.4 1998/01/04 04:31:41 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,8 @@ extern Node *transformExpr(ParseState *pstate, Node *expr, int precedence); extern Node *transformIdent(ParseState *pstate, Node *expr, int precedence); extern Oid exprType(Node *expr); -extern Node *handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno); +extern Node *handleNestedDots(ParseState *pstate, Attr *attr, + int *curr_resno, int precedence); extern Node *parser_typecast2(Node *expr, Oid exprType, Type tp, int typlen); #endif /* PARSE_EXPR_H */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index 9ff6ee91b8..12d6ba16b8 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_func.h,v 1.3 1997/11/26 03:43:12 momjian Exp $ + * $Id: parse_func.h,v 1.4 1998/01/04 04:31:42 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -43,7 +43,7 @@ typedef struct _CandidateList } *CandidateList; extern Node *ParseFunc(ParseState *pstate, char *funcname, List *fargs, - int *curr_resno); + int *curr_resno, int precedence); extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes); diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h index 7c78757ac3..e379b92932 100644 --- a/src/include/parser/parse_relation.h +++ b/src/include/parser/parse_relation.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: parse_relation.h,v 1.3 1997/11/26 03:43:16 momjian Exp $ + * $Id: parse_relation.h,v 1.4 1998/01/04 04:31:43 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,6 @@ extern int attnameAttNum(Relation rd, char *a); extern bool attnameIsSet(Relation rd, char *name); extern char *attnumAttName(Relation rd, int attrno); extern int attnumAttNelems(Relation rd, int attid); -extern Oid attnameTypeId(Oid relid, char *attrname); extern Oid attnumTypeId(Relation rd, int attid); extern void handleTargetColname(ParseState *pstate, char **resname, char *refname, char *colname); |
