database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +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

4
src/backend/catalog/index.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.150 2001/05/16 22:36:03 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/catalog/index.c,v 1.151 2001/05/18 22:35:50 momjian Exp $
* *
* *
* INTERFACE ROUTINES * INTERFACE ROUTINES
@ -2175,12 +2175,12 @@ reindex_relation(Oid relid, bool force)
heap_endscan(scan); heap_endscan(scan);
heap_close(indexRelation, AccessShareLock); heap_close(indexRelation, AccessShareLock);
if (reindexed) if (reindexed)
{
/* /*
* Ok,we could use the reindexed indexes of the target system * Ok,we could use the reindexed indexes of the target system
* relation now. * relation now.
*/ */
{
if (deactivate_needed) if (deactivate_needed)
{ {
if (!overwrite && relid == RelOid_pg_class) if (!overwrite && relid == RelOid_pg_class)

8
src/backend/parser/parse_expr.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.93 2001/05/18 21:24:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.94 2001/05/18 22:35:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -173,7 +173,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
a->lexpr, a->lexpr,
precedence); precedence);
result = ParseFuncOrColumn(pstate, result = ParseColumnOrFunc(pstate,
"nullvalue", "nullvalue",
makeList1(lexpr), makeList1(lexpr),
false, false, false, false,
@ -186,7 +186,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
a->lexpr, a->lexpr,
precedence); precedence);
result = ParseFuncOrColumn(pstate, result = ParseColumnOrFunc(pstate,
"nonnullvalue", "nonnullvalue",
makeList1(lexpr), makeList1(lexpr),
false, false, false, false,
@ -273,7 +273,7 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
lfirst(args) = transformExpr(pstate, lfirst(args) = transformExpr(pstate,
(Node *) lfirst(args), (Node *) lfirst(args),
precedence); precedence);
result = ParseFuncOrColumn(pstate, result = ParseColumnOrFunc(pstate,
fn->funcname, fn->funcname,
fn->args, fn->args,
fn->agg_star, fn->agg_star,

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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, (Node *) attr->paramNo,
EXPR_RELATION_FIRST); EXPR_RELATION_FIRST);
retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)), retval = ParseColumnOrFunc(pstate, strVal(lfirst(attr->attrs)),
makeList1(param), makeList1(param),
false, false, false, false,
precedence); precedence);
@ -86,7 +86,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int precedence)
ident->name = attr->relname; ident->name = attr->relname;
ident->isRel = TRUE; ident->isRel = TRUE;
retval = ParseFuncOrColumn(pstate, strVal(lfirst(attr->attrs)), retval = ParseColumnOrFunc(pstate, strVal(lfirst(attr->attrs)),
makeList1(ident), makeList1(ident),
false, false, false, false,
precedence); precedence);
@ -95,7 +95,7 @@ ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, int precedence)
/* Do more attributes follow this one? */ /* Do more attributes follow this one? */
foreach(mutator_iter, lnext(attr->attrs)) foreach(mutator_iter, lnext(attr->attrs))
{ {
retval = ParseFuncOrColumn(pstate, strVal(lfirst(mutator_iter)), retval = ParseColumnOrFunc(pstate, strVal(lfirst(mutator_iter)),
makeList1(retval), makeList1(retval),
false, false, false, false,
precedence); 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 * Node *
ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, ParseColumnOrFunc(ParseState *pstate, char *funcname, List *fargs,
bool agg_star, bool agg_distinct, bool agg_star, bool agg_distinct,
int precedence) int precedence)
{ {
@ -486,7 +489,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
} }
else else
{ {
elog(ERROR, "ParseFuncOrColumn: unexpected node type %d", elog(ERROR, "ParseColumnOrFunc: unexpected node type %d",
nodeTag(rteorjoin)); nodeTag(rteorjoin));
rte = NULL; /* keep compiler quiet */ rte = NULL; /* keep compiler quiet */
} }
@ -1535,7 +1538,7 @@ make_arguments(ParseState *pstate,
/* /*
** setup_field_select ** setup_field_select
** Build a FieldSelect node that says which attribute to project to. ** 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. ** a projection on a function result or parameter.
*/ */
static FieldSelect * static FieldSelect *

6
src/backend/utils/adt/format_type.c
View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.10 2001/03/22 03:59:50 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.11 2001/05/18 22:35:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -174,11 +174,11 @@ format_type_internal(Oid type_oid, int32 typemod)
break; break;
case TIMETZOID: case TIMETZOID:
buf = pstrdup("time with time zone"); buf = pstrdup("time & time zone");
break; break;
case TIMESTAMPOID: case TIMESTAMPOID:
buf = pstrdup("timestamp with time zone"); buf = pstrdup("timestamp & time zone");
break; break;
case VARBITOID: case VARBITOID:

4
src/include/parser/parse_func.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: parse_func.h,v 1.29 2001/03/22 04:00:57 momjian Exp $ * $Id: parse_func.h,v 1.30 2001/05/18 22:35:51 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -40,7 +40,7 @@ typedef struct _CandidateList
extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr, extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
int precedence); int precedence);
extern Node *ParseFuncOrColumn(ParseState *pstate, extern Node *ParseColumnOrFunc(ParseState *pstate,
char *funcname, List *fargs, char *funcname, List *fargs,
bool agg_star, bool agg_distinct, bool agg_star, bool agg_distinct,
int precedence); int precedence);