database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-15 19:15:29 +03:00
Code

Make rule lister do the right thing with Vars representing whole tuples.

Browse Source
This commit is contained in:
Tom Lane 2001-04-18 17:04:24 +00:00
parent 4a5905184f
commit 40136f4465
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.53 2001/03/22 03:59:41 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.54 2001/04/18 17:04:24 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -909,6 +909,9 @@ expandNamesVars(ParseState *pstate, List *names, List *vars)
* In particular, it will work on an RTE for a subselect, whereas * In particular, it will work on an RTE for a subselect, whereas
* get_attname() only works on real relations. * get_attname() only works on real relations.
* *
* "*" is returned if the given attnum is InvalidAttrNumber --- this case
* occurs when a Var represents a whole tuple of a relation.
*
* XXX Actually, this is completely bogus, because refnames of RTEs are * XXX Actually, this is completely bogus, because refnames of RTEs are
* not guaranteed unique, and may not even have scope across the whole * not guaranteed unique, and may not even have scope across the whole
* query. Cleanest fix would be to add refname/attname to Var nodes and * query. Cleanest fix would be to add refname/attname to Var nodes and
@ -920,6 +923,9 @@ get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum)
{ {
char *attname; char *attname;
if (attnum == InvalidAttrNumber)
return "*";
/* /*
* If there is an alias, use it * If there is an alias, use it
*/ */

31
src/backend/utils/adt/ruleutils.c
View File

@ -3,7 +3,7 @@
* back to source text * back to source text
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.76 2001/04/15 03:14:18 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.77 2001/04/18 17:04:24 tgl Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -1051,7 +1051,8 @@ get_basic_select_query(Query *query, deparse_context *context)
char *attname; char *attname;
get_names_for_var(var, context, &refname, &attname); get_names_for_var(var, context, &refname, &attname);
tell_as = (strcmp(attname, tle->resdom->resname) != 0); tell_as = (attname == NULL ||
strcmp(attname, tle->resdom->resname) != 0);
} }
/* and do if so */ /* and do if so */
@ -1380,6 +1381,9 @@ get_utility_query_def(Query *query, deparse_context *context)
/* /*
* Get the relation refname and attname for a (possibly nonlocal) Var. * Get the relation refname and attname for a (possibly nonlocal) Var.
* *
* attname will be returned as NULL if the Var represents a whole tuple
* of the relation.
*
* This is trickier than it ought to be because of the possibility of aliases * This is trickier than it ought to be because of the possibility of aliases
* and limited scope of refnames. We have to try to return the correct alias * and limited scope of refnames. We have to try to return the correct alias
* with respect to the current namespace given by the context. * with respect to the current namespace given by the context.
@ -1414,7 +1418,10 @@ get_names_for_var(Var *var, deparse_context *context,
*/ */
rte = rt_fetch(var->varno, dpns->rtable); rte = rt_fetch(var->varno, dpns->rtable);
*refname = rte->eref->relname; *refname = rte->eref->relname;
*attname = get_rte_attribute_name(rte, var->varattno); if (var->varattno == InvalidAttrNumber)
*attname = NULL;
else
*attname = get_rte_attribute_name(rte, var->varattno);
} }
/* /*
@ -1474,7 +1481,10 @@ find_alias_in_namespace(Node *nsnode, Node *expr,
RangeTblEntry *rte = rt_fetch(rtindex, rangetable); RangeTblEntry *rte = rt_fetch(rtindex, rangetable);
*refname = rte->eref->relname; *refname = rte->eref->relname;
*attname = get_rte_attribute_name(rte, var->varattno); if (var->varattno == InvalidAttrNumber)
*attname = NULL;
else
*attname = get_rte_attribute_name(rte, var->varattno);
return true; return true;
} }
} }
@ -1684,17 +1694,20 @@ get_rule_expr(Node *node, deparse_context *context)
char *attname; char *attname;
get_names_for_var(var, context, &refname, &attname); get_names_for_var(var, context, &refname, &attname);
if (context->varprefix) if (context->varprefix || attname == NULL)
{ {
if (strcmp(refname, "*NEW*") == 0) if (strcmp(refname, "*NEW*") == 0)
appendStringInfo(buf, "new."); appendStringInfo(buf, "new");
else if (strcmp(refname, "*OLD*") == 0) else if (strcmp(refname, "*OLD*") == 0)
appendStringInfo(buf, "old."); appendStringInfo(buf, "old");
else else
appendStringInfo(buf, "%s.", appendStringInfo(buf, "%s",
quote_identifier(refname)); quote_identifier(refname));
if (attname)
appendStringInfoChar(buf, '.');
} }
appendStringInfo(buf, "%s", quote_identifier(attname)); if (attname)
appendStringInfo(buf, "%s", quote_identifier(attname));
} }
break; break;