mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for aggs on views and complex ones. I missed one file.

Browse Source
This commit is contained in:
Bruce Momjian 1998-01-04 04:53:50 +00:00
parent 4b05912f0b
commit a65e4484da
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.4 1997/12/23 19:36:20 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.5 1998/01/04 04:53:50 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -55,7 +55,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
Node *temp; Node *temp;
/* what if att.attrs == "*"?? */ /* what if att.attrs == "*"?? */
temp = handleNestedDots(pstate, att, &pstate->p_last_resno); temp = handleNestedDots(pstate, att, &pstate->p_last_resno,
precedence);
if (att->indirection != NIL) if (att->indirection != NIL)
{ {
List *idx = att->indirection; List *idx = att->indirection;
@ -156,7 +157,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
result = ParseFunc(pstate, result = ParseFunc(pstate,
"nullvalue", lcons(lexpr, NIL), "nullvalue", lcons(lexpr, NIL),
&pstate->p_last_resno); &pstate->p_last_resno,
precedence);
} }
break; break;
case NOTNULL: case NOTNULL:
@ -165,7 +167,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
result = ParseFunc(pstate, result = ParseFunc(pstate,
"nonnullvalue", lcons(lexpr, NIL), "nonnullvalue", lcons(lexpr, NIL),
&pstate->p_last_resno); &pstate->p_last_resno,
precedence);
} }
break; break;
case AND: case AND:
@ -242,7 +245,8 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
foreach(args, fn->args) foreach(args, fn->args)
lfirst(args) = transformExpr(pstate, (Node *) lfirst(args), precedence); lfirst(args) = transformExpr(pstate, (Node *) lfirst(args), precedence);
result = ParseFunc(pstate, result = ParseFunc(pstate,
fn->funcname, fn->args, &pstate->p_last_resno); fn->funcname, fn->args, &pstate->p_last_resno,
precedence);
break; break;
} }
default: default:
@ -273,7 +277,8 @@ transformIdent(ParseState *pstate, Node *expr, int precedence)
att->relname = rte->refname; att->relname = rte->refname;
att->attrs = lcons(makeString(ident->name), NIL); att->attrs = lcons(makeString(ident->name), NIL);
column_result = column_result =
(Node *) handleNestedDots(pstate, att, &pstate->p_last_resno); (Node *) handleNestedDots(pstate, att, &pstate->p_last_resno,
precedence);
} }
/* try to find the ident as a relation */ /* try to find the ident as a relation */
@ -358,7 +363,7 @@ exprType(Node *expr)
** a tree with of Iter and Func nodes. ** a tree with of Iter and Func nodes.
*/ */
Node * Node *
handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno) handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno, int precedence)
{ {
List *mutator_iter; List *mutator_iter;
Node *retval = NULL; Node *retval = NULL;
@ -370,7 +375,8 @@ handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno)
retval = retval =
ParseFunc(pstate, strVal(lfirst(attr->attrs)), ParseFunc(pstate, strVal(lfirst(attr->attrs)),
lcons(param, NIL), lcons(param, NIL),
curr_resno); curr_resno,
precedence);
} }
else else
{ {
@ -381,14 +387,16 @@ handleNestedDots(ParseState *pstate, Attr *attr, int *curr_resno)
retval = retval =
ParseFunc(pstate, strVal(lfirst(attr->attrs)), ParseFunc(pstate, strVal(lfirst(attr->attrs)),
lcons(ident, NIL), lcons(ident, NIL),
curr_resno); curr_resno,
precedence);
} }
foreach(mutator_iter, lnext(attr->attrs)) foreach(mutator_iter, lnext(attr->attrs))
{ {
retval = ParseFunc(pstate, strVal(lfirst(mutator_iter)), retval = ParseFunc(pstate, strVal(lfirst(mutator_iter)),
lcons(retval, NIL), lcons(retval, NIL),
curr_resno); curr_resno,
precedence);
} }
return (retval); return (retval);