database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-17 06:41:09 +03:00
Code Activity

I made several adjustments to my earlier patch to handle the

Browse Source 
condition where the target label is ambiguous.
This commit is contained in:
Bruce Momjian
1998-06-05 03:49:20 +00:00
parent a576a60e3f
commit 2e6159311a
4 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/backend/parser/parse_clause.c
View File

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.17 1998/05/29 14:00:19 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_clause.c,v 1.18 1998/06/05 03:49:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -194,17 +194,32 @@ find_targetlist_entry(ParseState *pstate, SortGroupBy *sortgroupby, List *tlist)
* it will not be projected into the final tuple.
* daveh@insightdist.com 5/20/98
*/
if ( ! target_result) {
if ( ! target_result && sortgroupby->name) {
List *p_target = tlist;
Ident *missingTargetId = (Ident *)makeNode(Ident);
TargetEntry *tent = makeNode(TargetEntry);
/* Fill in the constructed Ident node */
missingTargetId->type = T_Ident;
missingTargetId->name = palloc(strlen(sortgroupby->name) + 1);
strcpy(missingTargetId->name, sortgroupby->name);
transformTargetId(pstate, missingTargetId, tent, missingTargetId->name, TRUE);
if (sortgroupby->range) {
Attr *missingTarget = (Attr *)makeNode(Attr);
missingTarget->type = T_Attr;
missingTarget->relname = palloc(strlen(sortgroupby->range) + 1);
strcpy(missingTarget->relname, sortgroupby->range);
missingTarget->attrs = lcons(makeString(sortgroupby->name), NIL);
transformTargetId(pstate, (Node*)missingTarget, tent, sortgroupby->name, TRUE);
}
else {
Ident *missingTarget = (Ident *)makeNode(Ident);
missingTarget->type = T_Ident;
missingTarget->name = palloc(strlen(sortgroupby->name) + 1);
strcpy(missingTarget->name, sortgroupby->name);
transformTargetId(pstate, (Node*)missingTarget, tent, sortgroupby->name, TRUE);
}
/* Add to the end of the target list */
while (lnext(p_target) != NIL) {

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

@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.14 1998/05/29 14:00:23 thomas Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.15 1998/06/05 03:49:18 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -54,7 +54,7 @@ size_target_expr(ParseState *pstate,
*/
void
transformTargetId(ParseState *pstate,
Ident *ident,
Node *node,
TargetEntry *tent,
char *resname,
int16 resjunk)
@ -68,7 +68,7 @@ transformTargetId(ParseState *pstate,
* relation names (even though they can be stored in
* Ident nodes, too)
*/
expr = transformIdent(pstate, (Node *) ident, EXPR_COLUMN_FIRST);
expr = transformExpr(pstate, node, EXPR_COLUMN_FIRST);
type_id = exprType(expr);
if (nodeTag(expr) == T_Var)
type_mod = ((Var *) expr)->vartypmod;
@ -113,7 +113,7 @@ transformTargetList(ParseState *pstate, List *targetlist)
identname = ((Ident *) res->val)->name;
handleTargetColname(pstate, &res->name, NULL, identname);
resname = (res->name) ? res->name : identname;
transformTargetId(pstate, (Ident*)res->val, tent, resname, FALSE);
transformTargetId(pstate, (Node*)res->val, tent, resname, FALSE);
break;
}
case T_ParamNo: