database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-16 06:01:02 +03:00
Code Activity

Rename ParseFuncOrColumn() to ParseColumnOrFunc().

Browse Source
This commit is contained in:
Bruce Momjian
2001-05-18 22:35:51 +00:00
parent dc0ff5c67a
commit 2fd831d323
5 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/backend/parser/parse_func.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.103 2001/05/18 21:24:19 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.104 2001/05/18 22:35:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -75,7 +75,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int precedence)
(Node *) attr->paramNo,
EXPR_RELATION_FIRST);
retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)),
retval = ParseColumnOrFunc(pstate, strVal(lfirst(attr->attrs)),
makeList1(param),
false, false,
precedence);
@ -86,7 +86,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int precedence)
ident->name = attr->relname;
ident->isRel = TRUE;
retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)),
retval = ParseColumnOrFunc(pstate, strVal(lfirst(attr->attrs)),
makeList1(ident),
false, false,
precedence);
@ -95,7 +95,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int precedence)
/* Do more attributes follow this one? */
foreach(mutator_iter, lnext(attr->attrs))
{
retval = ParseFuncOrColumn(pstate, strVal(lfirst(mutator_iter)),
retval = ParseColumnOrFunc(pstate, strVal(lfirst(mutator_iter)),
makeList1(retval),
false, false,
precedence);
@ -235,10 +235,13 @@ agg_select_candidate(Oid typeid, CandidateList candidates)
/*
* parse function
* parse function
* This code is confusing code because the database can accept relation.column
* column.function, or relation.column.function.
* Funcname is the first parameter, and fargs are the rest.
*/
Node *
ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
ParseColumnOrFunc(ParseState *pstate, char *funcname, List *fargs,
bool agg_star, bool agg_distinct,
int precedence)
{
@ -486,7 +489,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
}
else
{
elog(ERROR, "ParseFuncOrColumn: unexpected node type %d",
elog(ERROR, "ParseColumnOrFunc: unexpected node type %d",
nodeTag(rteorjoin));
rte = NULL; /* keep compiler quiet */
}
@ -1535,7 +1538,7 @@ make_arguments(ParseState *pstate,
/*
** setup_field_select
** Build a FieldSelect node that says which attribute to project to.
** This routine is called by ParseFuncOrColumn() when we have found
** This routine is called by ParseColumnOrFunc() when we have found
** a projection on a function result or parameter.
*/
static FieldSelect *