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

Fix dumping of views that are just VALUES(...) but have column aliases.

Browse Source 
The "simple" path for printing VALUES clauses doesn't work if we need
to attach nondefault column aliases, because there's noplace to do that
in the minimal VALUES() syntax.  So modify get_simple_values_rte() to
detect nondefault aliases and treat that as a non-simple case.  This
further exposes that the "non-simple" path never actually worked;
it didn't produce valid syntax.  Fix that too.  Per bug #12789 from
Curtis McEnroe, and analysis by Andrew Gierth.

Back-patch to all supported branches.  Before 9.3, this also requires
back-patching the part of commit 092d7ded29
that created get_simple_values_rte() to begin with; inserting the extra
test into the old factorization of that logic would've been too messy.
This commit is contained in:
Tom Lane
2015-02-25 12:01:12 -05:00
parent 89629f2895
commit 2164a0de29
3 changed files with 104 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4495,10 +4495,7 @@ get_simple_values_rte(Query *query)
/*
* We want to return TRUE even if the Query also contains OLD or NEW rule
* RTEs. So the idea is to scan the rtable and see if there is only one
* inFromCl RTE that is a VALUES RTE. We don't look at the targetlist at
* all. This is okay because parser/analyze.c will never generate a
* "bare" VALUES RTE --- they only appear inside auto-generated
* sub-queries with very restricted structure.
* inFromCl RTE that is a VALUES RTE.
*/
foreach(lc, query->rtable)
{
@ -4515,6 +4512,33 @@ get_simple_values_rte(Query *query)
else
return NULL; /* something else -> not simple VALUES */
}
/*
* We don't need to check the targetlist in any great detail, because
* parser/analyze.c will never generate a "bare" VALUES RTE --- they only
* appear inside auto-generated sub-queries with very restricted
* structure. However, DefineView might have modified the tlist by
* injecting new column aliases; so compare tlist resnames against the
* RTE's names to detect that.
*/
if (result)
{
ListCell *lcn;
if (list_length(query->targetList) != list_length(result->eref->colnames))
return NULL; /* this probably cannot happen */
forboth(lc, query->targetList, lcn, result->eref->colnames)
{
TargetEntry *tle = (TargetEntry *) lfirst(lc);
char *cname = strVal(lfirst(lcn));
if (tle->resjunk)
return NULL; /* this probably cannot happen */
if (tle->resname == NULL || strcmp(tle->resname, cname) != 0)
return NULL; /* column name has been changed */
}
}
return result;
}
@ -8419,7 +8443,9 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
break;
case RTE_VALUES:
/* Values list RTE */
appendStringInfoChar(buf, '(');
get_values_def(rte->values_lists, context);
appendStringInfoChar(buf, ')');
break;
case RTE_CTE:
appendStringInfoString(buf, quote_identifier(rte->ctename));
@ -8461,6 +8487,11 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
*/
printalias = true;
}
else if (rte->rtekind == RTE_VALUES)
{
/* Alias is syntactically required for VALUES */
printalias = true;
}
else if (rte->rtekind == RTE_CTE)
{
/*