rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of the "new" and "old" entries in a view's rangetable. 

The rule system needs "old" and/or "new" pseudo-RTEs in rule actions
that are ON INSERT/UPDATE/DELETE.  Historically it's put such entries
into the ON SELECT rules of views as well, but those are really quite
vestigial.  The only thing we've used them for is to carry the
view's relid forward to AcquireExecutorLocks (so that we can
re-lock the view to verify it hasn't changed before re-using a plan)
and to carry its relid and permissions data forward to execution-time
permissions checks.  What we can do instead of that is to retain
these fields of the RTE_RELATION RTE for the view even after we
convert it to an RTE_SUBQUERY RTE.  This requires a tiny amount of
extra complication in the planner and AcquireExecutorLocks, but on
the other hand we can get rid of the logic that moves that data from
one place to another.

The principal immediate benefit of doing this, aside from a small
saving in the pg_rewrite data for views, is that these pseudo-RTEs
no longer trigger ruleutils.c's heuristic about qualifying variable
names when the rangetable's length is more than 1.  That results
in quite a number of small simplifications in regression test outputs,
which are all to the good IMO.

Bump catversion because we need to dump a few more fields of
RTE_SUBQUERY RTEs.  While those will always be zeroes anyway in
stored rules (because we'd never populate them until query rewrite)
they are useful for debugging, and it seems like we'd better make
sure to transmit such RTEs accurately in plans sent to parallel
workers.  I don't think the executor actually examines these fields
after startup, but someday it might.

Amit Langote

Discussion: https://postgr.es/m/CA+HiwqEf7gPN4Hn+LoZ4tP2q_Qt7n3vw7-6fJKOf92tSEnX6Gg@mail.gmail.com
This commit is contained in:
Tom Lane 2023-01-11 19:41:02 -05:00
parent 2ff5ca86e8
commit 1b4d280ea1
34 changed files with 774 additions and 890 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/postgres_fdw/expected/postgres_fdw.out
View File

@ -2606,7 +2606,7 @@ SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN v5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c1
Foreign Scan Foreign Scan
Output: ft4.c1, ft5.c2, ft5.c1 Output: ft4.c1, ft5.c2, ft5.c1
Relations: (public.ft4) LEFT JOIN (public.ft5) Relations: (public.ft4) LEFT JOIN (public.ft5)
Remote SQL: SELECT r6.c1, r9.c2, r9.c1 FROM ("S 1"."T 3" r6 LEFT JOIN "S 1"."T 4" r9 ON (((r6.c1 = r9.c1)))) ORDER BY r6.c1 ASC NULLS LAST, r9.c1 ASC NULLS LAST LIMIT 10::bigint OFFSET 10::bigint Remote SQL: SELECT r4.c1, r5.c2, r5.c1 FROM ("S 1"."T 3" r4 LEFT JOIN "S 1"."T 4" r5 ON (((r4.c1 = r5.c1)))) ORDER BY r4.c1 ASC NULLS LAST, r5.c1 ASC NULLS LAST LIMIT 10::bigint OFFSET 10::bigint
(4 rows) (4 rows)
SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN v5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c1, t2.c1 OFFSET 10 LIMIT 10; SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN v5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c1, t2.c1 OFFSET 10 LIMIT 10;
@ -2669,7 +2669,7 @@ SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN ft5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c
Foreign Scan Foreign Scan
Output: ft4.c1, t2.c2, t2.c1 Output: ft4.c1, t2.c2, t2.c1
Relations: (public.ft4) LEFT JOIN (public.ft5 t2) Relations: (public.ft4) LEFT JOIN (public.ft5 t2)
Remote SQL: SELECT r6.c1, r2.c2, r2.c1 FROM ("S 1"."T 3" r6 LEFT JOIN "S 1"."T 4" r2 ON (((r6.c1 = r2.c1)))) ORDER BY r6.c1 ASC NULLS LAST, r2.c1 ASC NULLS LAST LIMIT 10::bigint OFFSET 10::bigint Remote SQL: SELECT r4.c1, r2.c2, r2.c1 FROM ("S 1"."T 3" r4 LEFT JOIN "S 1"."T 4" r2 ON (((r4.c1 = r2.c1)))) ORDER BY r4.c1 ASC NULLS LAST, r2.c1 ASC NULLS LAST LIMIT 10::bigint OFFSET 10::bigint
(4 rows) (4 rows)
SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN ft5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c1, t2.c1 OFFSET 10 LIMIT 10; SELECT t1.c1, t2.c2 FROM v4 t1 LEFT JOIN ft5 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c1, t2.c1 OFFSET 10 LIMIT 10;
@ -6557,10 +6557,10 @@ CREATE VIEW rw_view AS SELECT * FROM foreign_tbl
a | integer | | | | plain | a | integer | | | | plain |
b | integer | | | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT foreign_tbl.a, SELECT a,
foreign_tbl.b b
FROM foreign_tbl FROM foreign_tbl
WHERE foreign_tbl.a < foreign_tbl.b; WHERE a < b;
Options: check_option=cascaded Options: check_option=cascaded
EXPLAIN (VERBOSE, COSTS OFF) EXPLAIN (VERBOSE, COSTS OFF)
@ -6674,10 +6674,10 @@ CREATE VIEW rw_view AS SELECT * FROM parent_tbl
a | integer | | | | plain | a | integer | | | | plain |
b | integer | | | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT parent_tbl.a, SELECT a,
parent_tbl.b b
FROM parent_tbl FROM parent_tbl
WHERE parent_tbl.a < parent_tbl.b; WHERE a < b;
Options: check_option=cascaded Options: check_option=cascaded
EXPLAIN (VERBOSE, COSTS OFF) EXPLAIN (VERBOSE, COSTS OFF)

9
src/backend/commands/lockcmds.c
View File

@ -194,15 +194,6 @@ LockViewRecurse_walker(Node *node, LockViewRecurse_context *context)
char relkind = rte->relkind; char relkind = rte->relkind;
char *relname = get_rel_name(relid); char *relname = get_rel_name(relid);
/*
* The OLD and NEW placeholder entries in the view's rtable are
* skipped.
*/
if (relid == context->viewoid &&
(strcmp(rte->eref->aliasname, "old") == 0 ||
strcmp(rte->eref->aliasname, "new") == 0))
continue;
/* Currently, we only allow plain tables or views to be locked. */ /* Currently, we only allow plain tables or views to be locked. */
if (relkind != RELKIND_RELATION && relkind != RELKIND_PARTITIONED_TABLE && if (relkind != RELKIND_RELATION && relkind != RELKIND_PARTITIONED_TABLE &&
relkind != RELKIND_VIEW) relkind != RELKIND_VIEW)

107
src/backend/commands/view.c
View File

@ -353,107 +353,6 @@ DefineViewRules(Oid viewOid, Query *viewParse, bool replace)
*/ */
} }
/*---------------------------------------------------------------
* UpdateRangeTableOfViewParse
*
* Update the range table of the given parsetree.
* This update consists of adding two new entries IN THE BEGINNING
* of the range table (otherwise the rule system will die a slow,
* horrible and painful death, and we do not want that now, do we?)
* one for the OLD relation and one for the NEW one (both of
* them refer in fact to the "view" relation).
*
* Of course we must also increase the 'varnos' of all the Var nodes
* by 2...
*
* These extra RT entries are not actually used in the query,
* except for run-time locking.
*---------------------------------------------------------------
*/
static Query *
UpdateRangeTableOfViewParse(Oid viewOid, Query *viewParse)
{
Relation viewRel;
List *new_rt;
ParseNamespaceItem *nsitem;
RangeTblEntry *rt_entry1,
*rt_entry2;
RTEPermissionInfo *rte_perminfo1;
ParseState *pstate;
ListCell *lc;
/*
* Make a copy of the given parsetree. It's not so much that we don't
* want to scribble on our input, it's that the parser has a bad habit of
* outputting multiple links to the same subtree for constructs like
* BETWEEN, and we mustn't have OffsetVarNodes increment the varno of a
* Var node twice. copyObject will expand any multiply-referenced subtree
* into multiple copies.
*/
viewParse = copyObject(viewParse);
/* Create a dummy ParseState for addRangeTableEntryForRelation */
pstate = make_parsestate(NULL);
/* need to open the rel for addRangeTableEntryForRelation */
viewRel = relation_open(viewOid, AccessShareLock);
/*
* Create the 2 new range table entries and form the new range table...
* OLD first, then NEW....
*/
nsitem = addRangeTableEntryForRelation(pstate, viewRel,
AccessShareLock,
makeAlias("old", NIL),
false, false);
rt_entry1 = nsitem->p_rte;
rte_perminfo1 = nsitem->p_perminfo;
nsitem = addRangeTableEntryForRelation(pstate, viewRel,
AccessShareLock,
makeAlias("new", NIL),
false, false);
rt_entry2 = nsitem->p_rte;
/*
* Add only the "old" RTEPermissionInfo at the head of view query's list
* and update the other RTEs' perminfoindex accordingly. When rewriting a
* query on the view, ApplyRetrieveRule() will transfer the view
* relation's permission details into this RTEPermissionInfo. That's
* needed because the view's RTE itself will be transposed into a subquery
* RTE that can't carry the permission details; see the code stanza toward
* the end of ApplyRetrieveRule() for how that's done.
*/
viewParse->rteperminfos = lcons(rte_perminfo1, viewParse->rteperminfos);
foreach(lc, viewParse->rtable)
{
RangeTblEntry *rte = lfirst(lc);
if (rte->perminfoindex > 0)
rte->perminfoindex += 1;
}
/*
* Also make the "new" RTE's RTEPermissionInfo undiscoverable. This is a
* bit of a hack given that all the non-child RTE_RELATION entries really
* should have a RTEPermissionInfo, but this dummy "new" RTE is going to
* go away anyway in the very near future.
*/
rt_entry2->perminfoindex = 0;
new_rt = lcons(rt_entry1, lcons(rt_entry2, viewParse->rtable));
viewParse->rtable = new_rt;
/*
* Now offset all var nodes by 2, and jointree RT indexes too.
*/
OffsetVarNodes((Node *) viewParse, 2, 0);
relation_close(viewRel, AccessShareLock);
return viewParse;
}
/* /*
* DefineView * DefineView
* Execute a CREATE VIEW command. * Execute a CREATE VIEW command.
@ -616,12 +515,6 @@ DefineView(ViewStmt *stmt, const char *queryString,
void void
StoreViewQuery(Oid viewOid, Query *viewParse, bool replace) StoreViewQuery(Oid viewOid, Query *viewParse, bool replace)
{ {
/*
* The range table of 'viewParse' does not contain entries for the "OLD"
* and "NEW" relations. So... add them!
*/
viewParse = UpdateRangeTableOfViewParse(viewOid, viewParse);
/* /*
* Now create the rules associated with the view. * Now create the rules associated with the view.
*/ */

7
src/backend/nodes/outfuncs.c
View File

@ -512,6 +512,10 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
case RTE_SUBQUERY: case RTE_SUBQUERY:
WRITE_NODE_FIELD(subquery); WRITE_NODE_FIELD(subquery);
WRITE_BOOL_FIELD(security_barrier); WRITE_BOOL_FIELD(security_barrier);
/* we re-use these RELATION fields, too: */
WRITE_OID_FIELD(relid);
WRITE_INT_FIELD(rellockmode);
WRITE_UINT_FIELD(perminfoindex);
break; break;
case RTE_JOIN: case RTE_JOIN:
WRITE_ENUM_FIELD(jointype, JoinType); WRITE_ENUM_FIELD(jointype, JoinType);
@ -545,10 +549,11 @@ _outRangeTblEntry(StringInfo str, const RangeTblEntry *node)
case RTE_NAMEDTUPLESTORE: case RTE_NAMEDTUPLESTORE:
WRITE_STRING_FIELD(enrname); WRITE_STRING_FIELD(enrname);
WRITE_FLOAT_FIELD(enrtuples); WRITE_FLOAT_FIELD(enrtuples);
WRITE_OID_FIELD(relid);
WRITE_NODE_FIELD(coltypes); WRITE_NODE_FIELD(coltypes);
WRITE_NODE_FIELD(coltypmods); WRITE_NODE_FIELD(coltypmods);
WRITE_NODE_FIELD(colcollations); WRITE_NODE_FIELD(colcollations);
/* we re-use these RELATION fields, too: */
WRITE_OID_FIELD(relid);
break; break;
case RTE_RESULT: case RTE_RESULT:
/* no extra fields */ /* no extra fields */

7
src/backend/nodes/readfuncs.c
View File

@ -478,6 +478,10 @@ _readRangeTblEntry(void)
case RTE_SUBQUERY: case RTE_SUBQUERY:
READ_NODE_FIELD(subquery); READ_NODE_FIELD(subquery);
READ_BOOL_FIELD(security_barrier); READ_BOOL_FIELD(security_barrier);
/* we re-use these RELATION fields, too: */
READ_OID_FIELD(relid);
READ_INT_FIELD(rellockmode);
READ_UINT_FIELD(perminfoindex);
break; break;
case RTE_JOIN: case RTE_JOIN:
READ_ENUM_FIELD(jointype, JoinType); READ_ENUM_FIELD(jointype, JoinType);
@ -520,10 +524,11 @@ _readRangeTblEntry(void)
case RTE_NAMEDTUPLESTORE: case RTE_NAMEDTUPLESTORE:
READ_STRING_FIELD(enrname); READ_STRING_FIELD(enrname);
READ_FLOAT_FIELD(enrtuples); READ_FLOAT_FIELD(enrtuples);
READ_OID_FIELD(relid);
READ_NODE_FIELD(coltypes); READ_NODE_FIELD(coltypes);
READ_NODE_FIELD(coltypmods); READ_NODE_FIELD(coltypmods);
READ_NODE_FIELD(colcollations); READ_NODE_FIELD(colcollations);
/* we re-use these RELATION fields, too: */
READ_OID_FIELD(relid);
break; break;
case RTE_RESULT: case RTE_RESULT:
/* no extra fields */ /* no extra fields */

26
src/backend/optimizer/plan/setrefs.c
View File

@ -405,13 +405,15 @@ add_rtes_to_flat_rtable(PlannerInfo *root, bool recursing)
* *
* At top level, we must add all RTEs so that their indexes in the * At top level, we must add all RTEs so that their indexes in the
* flattened rangetable match up with their original indexes. When * flattened rangetable match up with their original indexes. When
* recursing, we only care about extracting relation RTEs. * recursing, we only care about extracting relation RTEs (and subquery
* RTEs that were once relation RTEs).
*/ */
foreach(lc, root->parse->rtable) foreach(lc, root->parse->rtable)
{ {
RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc); RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
if (!recursing || rte->rtekind == RTE_RELATION) if (!recursing || rte->rtekind == RTE_RELATION ||
(rte->rtekind == RTE_SUBQUERY && OidIsValid(rte->relid)))
add_rte_to_flat_rtable(glob, root->parse->rteperminfos, rte); add_rte_to_flat_rtable(glob, root->parse->rteperminfos, rte);
} }
@ -501,8 +503,9 @@ flatten_rtes_walker(Node *node, flatten_rtes_walker_context *cxt)
{ {
RangeTblEntry *rte = (RangeTblEntry *) node; RangeTblEntry *rte = (RangeTblEntry *) node;
/* As above, we need only save relation RTEs */ /* As above, we need only save relation RTEs and former relations */
if (rte->rtekind == RTE_RELATION) if (rte->rtekind == RTE_RELATION ||
(rte->rtekind == RTE_SUBQUERY && OidIsValid(rte->relid)))
add_rte_to_flat_rtable(cxt->glob, cxt->query->rteperminfos, rte); add_rte_to_flat_rtable(cxt->glob, cxt->query->rteperminfos, rte);
return false; return false;
} }
@ -560,7 +563,8 @@ add_rte_to_flat_rtable(PlannerGlobal *glob, List *rteperminfos,
glob->finalrtable = lappend(glob->finalrtable, newrte); glob->finalrtable = lappend(glob->finalrtable, newrte);
/* /*
* If it's a plain relation RTE, add the table to relationOids. * If it's a plain relation RTE (or a subquery that was once a view
* reference), add the relation OID to relationOids.
* *
* We do this even though the RTE might be unreferenced in the plan tree; * We do this even though the RTE might be unreferenced in the plan tree;
* this would correspond to cases such as views that were expanded, child * this would correspond to cases such as views that were expanded, child
@ -570,7 +574,8 @@ add_rte_to_flat_rtable(PlannerGlobal *glob, List *rteperminfos,
* Note we don't bother to avoid making duplicate list entries. We could, * Note we don't bother to avoid making duplicate list entries. We could,
* but it would probably cost more cycles than it would save. * but it would probably cost more cycles than it would save.
*/ */
if (newrte->rtekind == RTE_RELATION) if (newrte->rtekind == RTE_RELATION ||
(newrte->rtekind == RTE_SUBQUERY && OidIsValid(newrte->relid)))
glob->relationOids = lappend_oid(glob->relationOids, newrte->relid); glob->relationOids = lappend_oid(glob->relationOids, newrte->relid);
/* /*
@ -3403,14 +3408,11 @@ extract_query_dependencies_walker(Node *node, PlannerInfo *context)
{ {
RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc); RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
if (rte->rtekind == RTE_RELATION) if (rte->rtekind == RTE_RELATION ||
(rte->rtekind == RTE_SUBQUERY && OidIsValid(rte->relid)) ||
(rte->rtekind == RTE_NAMEDTUPLESTORE && OidIsValid(rte->relid)))
context->glob->relationOids = context->glob->relationOids =
lappend_oid(context->glob->relationOids, rte->relid); lappend_oid(context->glob->relationOids, rte->relid);
else if (rte->rtekind == RTE_NAMEDTUPLESTORE &&
OidIsValid(rte->relid))
context->glob->relationOids =
lappend_oid(context->glob->relationOids,
rte->relid);
} }
/* And recurse into the query's subexpressions */ /* And recurse into the query's subexpressions */

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

@ -3834,7 +3834,7 @@ addRTEPermissionInfo(List **rteperminfos, RangeTblEntry *rte)
{ {
RTEPermissionInfo *perminfo; RTEPermissionInfo *perminfo;
Assert(rte->rtekind == RTE_RELATION); Assert(OidIsValid(rte->relid));
Assert(rte->perminfoindex == 0); Assert(rte->perminfoindex == 0);
/* Nope, so make one and add to the list. */ /* Nope, so make one and add to the list. */

7
src/backend/rewrite/rewriteDefine.c
View File

@ -633,13 +633,6 @@ checkRuleResultList(List *targetList, TupleDesc resultDesc, bool isSelect,
* setRuleCheckAsUser * setRuleCheckAsUser
* Recursively scan a query or expression tree and set the checkAsUser * Recursively scan a query or expression tree and set the checkAsUser
* field to the given userid in all RTEPermissionInfos of the query. * field to the given userid in all RTEPermissionInfos of the query.
*
* Note: for a view (ON SELECT rule), the checkAsUser field of the OLD
* RTE entry's RTEPermissionInfo will be overridden when the view rule is
* expanded, and the checkAsUser for the NEW RTE entry's RTEPermissionInfo is
* irrelevant because its requiredPerms bits will always be zero. However, for
* other types of rules it's important to set these fields to match the rule
* owner. So we just set them always.
*/ */
void void
setRuleCheckAsUser(Node *node, Oid userid) setRuleCheckAsUser(Node *node, Oid userid)

38
src/backend/rewrite/rewriteHandler.c
View File

@ -1715,10 +1715,7 @@ ApplyRetrieveRule(Query *parsetree,
List *activeRIRs) List *activeRIRs)
{ {
Query *rule_action; Query *rule_action;
RangeTblEntry *rte, RangeTblEntry *rte;
*subrte;
RTEPermissionInfo *perminfo,
*sub_perminfo;
RowMarkClause *rc; RowMarkClause *rc;
if (list_length(rule->actions) != 1) if (list_length(rule->actions) != 1)
@ -1830,32 +1827,20 @@ ApplyRetrieveRule(Query *parsetree,
* original RTE to a subquery RTE. * original RTE to a subquery RTE.
*/ */
rte = rt_fetch(rt_index, parsetree->rtable); rte = rt_fetch(rt_index, parsetree->rtable);
perminfo = getRTEPermissionInfo(parsetree->rteperminfos, rte);
rte->rtekind = RTE_SUBQUERY; rte->rtekind = RTE_SUBQUERY;
rte->subquery = rule_action; rte->subquery = rule_action;
rte->security_barrier = RelationIsSecurityView(relation); rte->security_barrier = RelationIsSecurityView(relation);
/* Clear fields that should not be set in a subquery RTE */
rte->relid = InvalidOid;
rte->relkind = 0;
rte->rellockmode = 0;
rte->tablesample = NULL;
rte->perminfoindex = 0; /* no permission checking for this RTE */
rte->inh = false; /* must not be set for a subquery */
/* /*
* We move the view's permission check data down to its RTEPermissionInfo * Clear fields that should not be set in a subquery RTE. Note that we
* contained in the view query, which the OLD entry in its range table * leave the relid, rellockmode, and perminfoindex fields set, so that the
* points to. * view relation can be appropriately locked before execution and its
* permissions checked.
*/ */
subrte = rt_fetch(PRS2_OLD_VARNO, rule_action->rtable); rte->relkind = 0;
Assert(subrte->relid == relation->rd_id); rte->tablesample = NULL;
sub_perminfo = getRTEPermissionInfo(rule_action->rteperminfos, subrte); rte->inh = false; /* must not be set for a subquery */
sub_perminfo->requiredPerms = perminfo->requiredPerms;
sub_perminfo->checkAsUser = perminfo->checkAsUser;
sub_perminfo->selectedCols = perminfo->selectedCols;
sub_perminfo->insertedCols = perminfo->insertedCols;
sub_perminfo->updatedCols = perminfo->updatedCols;
return parsetree; return parsetree;
} }
@ -1867,9 +1852,10 @@ ApplyRetrieveRule(Query *parsetree,
* aggregate. We leave it to the planner to detect that. * aggregate. We leave it to the planner to detect that.
* *
* NB: this must agree with the parser's transformLockingClause() routine. * NB: this must agree with the parser's transformLockingClause() routine.
* However, unlike the parser we have to be careful not to mark a view's * However, we used to have to avoid marking a view's OLD and NEW rels for
* OLD and NEW rels for updating. The best way to handle that seems to be * updating, which motivated scanning the jointree to determine which rels
* to scan the jointree to determine which rels are used. * are used. Possibly that could now be simplified into just scanning the
* rangetable as the parser does.
*/ */
static void static void
markQueryForLocking(Query *qry, Node *jtnode, markQueryForLocking(Query *qry, Node *jtnode,

3
src/backend/utils/cache/plancache.c vendored
View File

@ -1769,7 +1769,8 @@ AcquireExecutorLocks(List *stmt_list, bool acquire)
{ {
RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc2); RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc2);
if (rte->rtekind != RTE_RELATION) if (!(rte->rtekind == RTE_RELATION ||
(rte->rtekind == RTE_SUBQUERY && OidIsValid(rte->relid))))
continue; continue;
/* /*

12
src/bin/pg_dump/t/002_pg_dump.pl
View File

@ -2280,7 +2280,7 @@ my %tests = (
SELECT col1 FROM dump_test.test_table;', SELECT col1 FROM dump_test.test_table;',
regexp => qr/^ regexp => qr/^
\QCREATE MATERIALIZED VIEW dump_test.matview AS\E \QCREATE MATERIALIZED VIEW dump_test.matview AS\E
\n\s+\QSELECT test_table.col1\E \n\s+\QSELECT col1\E
\n\s+\QFROM dump_test.test_table\E \n\s+\QFROM dump_test.test_table\E
\n\s+\QWITH NO DATA;\E \n\s+\QWITH NO DATA;\E
/xm, /xm,
@ -2296,7 +2296,7 @@ my %tests = (
SELECT * FROM dump_test.matview;', SELECT * FROM dump_test.matview;',
regexp => qr/^ regexp => qr/^
\QCREATE MATERIALIZED VIEW dump_test.matview_second AS\E \QCREATE MATERIALIZED VIEW dump_test.matview_second AS\E
\n\s+\QSELECT matview.col1\E \n\s+\QSELECT col1\E
\n\s+\QFROM dump_test.matview\E \n\s+\QFROM dump_test.matview\E
\n\s+\QWITH NO DATA;\E \n\s+\QWITH NO DATA;\E
/xm, /xm,
@ -2312,7 +2312,7 @@ my %tests = (
SELECT * FROM dump_test.matview_second WITH NO DATA;', SELECT * FROM dump_test.matview_second WITH NO DATA;',
regexp => qr/^ regexp => qr/^
\QCREATE MATERIALIZED VIEW dump_test.matview_third AS\E \QCREATE MATERIALIZED VIEW dump_test.matview_third AS\E
\n\s+\QSELECT matview_second.col1\E \n\s+\QSELECT col1\E
\n\s+\QFROM dump_test.matview_second\E \n\s+\QFROM dump_test.matview_second\E
\n\s+\QWITH NO DATA;\E \n\s+\QWITH NO DATA;\E
/xm, /xm,
@ -2328,7 +2328,7 @@ my %tests = (
SELECT * FROM dump_test.matview_third WITH NO DATA;', SELECT * FROM dump_test.matview_third WITH NO DATA;',
regexp => qr/^ regexp => qr/^
\QCREATE MATERIALIZED VIEW dump_test.matview_fourth AS\E \QCREATE MATERIALIZED VIEW dump_test.matview_fourth AS\E
\n\s+\QSELECT matview_third.col1\E \n\s+\QSELECT col1\E
\n\s+\QFROM dump_test.matview_third\E \n\s+\QFROM dump_test.matview_third\E
\n\s+\QWITH NO DATA;\E \n\s+\QWITH NO DATA;\E
/xm, /xm,
@ -2346,7 +2346,7 @@ my %tests = (
ALTER COLUMN col2 SET COMPRESSION lz4;', ALTER COLUMN col2 SET COMPRESSION lz4;',
regexp => qr/^ regexp => qr/^
\QCREATE MATERIALIZED VIEW dump_test.matview_compression AS\E \QCREATE MATERIALIZED VIEW dump_test.matview_compression AS\E
\n\s+\QSELECT test_table.col2\E \n\s+\QSELECT col2\E
\n\s+\QFROM dump_test.test_table\E \n\s+\QFROM dump_test.test_table\E
\n\s+\QWITH NO DATA;\E \n\s+\QWITH NO DATA;\E
.* .*
@ -3342,7 +3342,7 @@ my %tests = (
SELECT col1 FROM dump_test.test_table;', SELECT col1 FROM dump_test.test_table;',
regexp => qr/^ regexp => qr/^
\QCREATE VIEW dump_test.test_view WITH (security_barrier='true') AS\E \QCREATE VIEW dump_test.test_view WITH (security_barrier='true') AS\E
\n\s+\QSELECT test_table.col1\E \n\s+\QSELECT col1\E
\n\s+\QFROM dump_test.test_table\E \n\s+\QFROM dump_test.test_table\E
\n\s+\QWITH LOCAL CHECK OPTION;\E/xm, \n\s+\QWITH LOCAL CHECK OPTION;\E/xm,
like => like =>

2
src/include/catalog/catversion.h
View File

@ -57,6 +57,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 202301092 #define CATALOG_VERSION_NO 202301111
#endif #endif

18
src/include/nodes/parsenodes.h
View File

@ -1009,11 +1009,6 @@ typedef struct RangeTblEntry
/* /*
* Fields valid for a plain relation RTE (else zero): * Fields valid for a plain relation RTE (else zero):
* *
* As a special case, RTE_NAMEDTUPLESTORE can also set relid to indicate
* that the tuple format of the tuplestore is the same as the referenced
* relation. This allows plans referencing AFTER trigger transition
* tables to be invalidated if the underlying table is altered.
*
* rellockmode is really LOCKMODE, but it's declared int to avoid having * rellockmode is really LOCKMODE, but it's declared int to avoid having
* to include lock-related headers here. It must be RowExclusiveLock if * to include lock-related headers here. It must be RowExclusiveLock if
* the RTE is an INSERT/UPDATE/DELETE/MERGE target, else RowShareLock if * the RTE is an INSERT/UPDATE/DELETE/MERGE target, else RowShareLock if
@ -1028,6 +1023,19 @@ typedef struct RangeTblEntry
* perminfoindex is 1-based index of the RTEPermissionInfo belonging to * perminfoindex is 1-based index of the RTEPermissionInfo belonging to
* this RTE in the containing struct's list of same; 0 if permissions need * this RTE in the containing struct's list of same; 0 if permissions need
* not be checked for this RTE. * not be checked for this RTE.
*
* As a special case, relid, rellockmode, and perminfoindex can also be
* set (nonzero) in an RTE_SUBQUERY RTE. This occurs when we convert an
* RTE_RELATION RTE naming a view into an RTE_SUBQUERY containing the
* view's query. We still need to perform run-time locking and permission
* checks on the view, even though it's not directly used in the query
* anymore, and the most expedient way to do that is to retain these
* fields from the old state of the RTE.
*
* As a special case, RTE_NAMEDTUPLESTORE can also set relid to indicate
* that the tuple format of the tuplestore is the same as the referenced
* relation. This allows plans referencing AFTER trigger transition
* tables to be invalidated if the underlying table is altered.
*/ */
Oid relid; /* OID of the relation */ Oid relid; /* OID of the relation */
char relkind; /* relation kind (see pg_class.relkind) */ char relkind; /* relation kind (see pg_class.relkind) */

26
src/test/regress/expected/aggregates.out
View File

@ -1634,7 +1634,7 @@ select * from agg_view1;
select pg_get_viewdef('agg_view1'::regclass); select pg_get_viewdef('agg_view1'::regclass);
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------
SELECT aggfns(v.a, v.b, v.c) AS aggfns + SELECT aggfns(a, b, c) AS aggfns +
FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c); FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c);
(1 row) (1 row)
@ -1686,7 +1686,7 @@ select * from agg_view1;
select pg_get_viewdef('agg_view1'::regclass); select pg_get_viewdef('agg_view1'::regclass);
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------
SELECT aggfns(v.a, v.b, v.c ORDER BY (v.b + 1)) AS aggfns + SELECT aggfns(a, b, c ORDER BY (b + 1)) AS aggfns +
FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c); FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c);
(1 row) (1 row)
@ -1702,7 +1702,7 @@ select * from agg_view1;
select pg_get_viewdef('agg_view1'::regclass); select pg_get_viewdef('agg_view1'::regclass);
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------
SELECT aggfns(v.a, v.a, v.c ORDER BY v.b) AS aggfns + SELECT aggfns(a, a, c ORDER BY b) AS aggfns +
FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c); FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c);
(1 row) (1 row)
@ -1718,7 +1718,7 @@ select * from agg_view1;
select pg_get_viewdef('agg_view1'::regclass); select pg_get_viewdef('agg_view1'::regclass);
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------
SELECT aggfns(v.a, v.b, v.c ORDER BY v.c USING ~<~ NULLS LAST) AS aggfns + SELECT aggfns(a, b, c ORDER BY c USING ~<~ NULLS LAST) AS aggfns +
FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c); FROM ( VALUES (1,3,'foo'::text), (0,NULL::integer,NULL::text), (2,2,'bar'::text), (3,1,'baz'::text)) v(a, b, c);
(1 row) (1 row)
@ -2203,15 +2203,15 @@ select ten,
from tenk1 from tenk1
group by ten order by ten; group by ten order by ten;
select pg_get_viewdef('aggordview1'); select pg_get_viewdef('aggordview1');
pg_get_viewdef pg_get_viewdef
------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------
SELECT tenk1.ten, + SELECT ten, +
percentile_disc((0.5)::double precision) WITHIN GROUP (ORDER BY tenk1.thousand) AS p50, + percentile_disc((0.5)::double precision) WITHIN GROUP (ORDER BY thousand) AS p50, +
percentile_disc((0.5)::double precision) WITHIN GROUP (ORDER BY tenk1.thousand) FILTER (WHERE (tenk1.hundred = 1)) AS px,+ percentile_disc((0.5)::double precision) WITHIN GROUP (ORDER BY thousand) FILTER (WHERE (hundred = 1)) AS px,+
rank(5, 'AZZZZ'::name, 50) WITHIN GROUP (ORDER BY tenk1.hundred, tenk1.string4 DESC, tenk1.hundred) AS rank + rank(5, 'AZZZZ'::name, 50) WITHIN GROUP (ORDER BY hundred, string4 DESC, hundred) AS rank +
FROM tenk1 + FROM tenk1 +
GROUP BY tenk1.ten + GROUP BY ten +
ORDER BY tenk1.ten; ORDER BY ten;
(1 row) (1 row)
select * from aggordview1 order by ten; select * from aggordview1 order by ten;

16
src/test/regress/expected/alter_table.out
View File

@ -2493,8 +2493,8 @@ create view at_view_2 as select *, to_json(v1) as j from at_view_1 v1;
id | integer | | | | plain | id | integer | | | | plain |
stuff | text | | | | extended | stuff | text | | | | extended |
View definition: View definition:
SELECT bt.id, SELECT id,
bt.stuff stuff
FROM at_base_table bt; FROM at_base_table bt;
\d+ at_view_2 \d+ at_view_2
@ -2505,8 +2505,8 @@ View definition:
stuff | text | | | | extended | stuff | text | | | | extended |
j | json | | | | extended | j | json | | | | extended |
View definition: View definition:
SELECT v1.id, SELECT id,
v1.stuff, stuff,
to_json(v1.*) AS j to_json(v1.*) AS j
FROM at_view_1 v1; FROM at_view_1 v1;
@ -2532,8 +2532,8 @@ create or replace view at_view_1 as select *, 2+2 as more from at_base_table bt;
stuff | text | | | | extended | stuff | text | | | | extended |
more | integer | | | | plain | more | integer | | | | plain |
View definition: View definition:
SELECT bt.id, SELECT id,
bt.stuff, stuff,
2 + 2 AS more 2 + 2 AS more
FROM at_base_table bt; FROM at_base_table bt;
@ -2545,8 +2545,8 @@ View definition:
stuff | text | | | | extended | stuff | text | | | | extended |
j | json | | | | extended | j | json | | | | extended |
View definition: View definition:
SELECT v1.id, SELECT id,
v1.stuff, stuff,
to_json(v1.*) AS j to_json(v1.*) AS j
FROM at_view_1 v1; FROM at_view_1 v1;

24
src/test/regress/expected/collate.icu.utf8.out
View File

@ -446,18 +446,18 @@ CREATE VIEW collview2 AS SELECT a, b FROM collate_test1 ORDER BY b COLLATE "C";
CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "C") FROM collate_test10; CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "C") FROM collate_test10;
SELECT table_name, view_definition FROM information_schema.views SELECT table_name, view_definition FROM information_schema.views
WHERE table_name LIKE 'collview%' ORDER BY 1; WHERE table_name LIKE 'collview%' ORDER BY 1;
table_name | view_definition table_name | view_definition
------------+-------------------------------------------------------------------------- ------------+--------------------------------------------
collview1 | SELECT collate_test1.a, + collview1 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| WHERE ((collate_test1.b COLLATE "C") >= 'bbc'::text); | WHERE ((b COLLATE "C") >= 'bbc'::text);
collview2 | SELECT collate_test1.a, + collview2 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| ORDER BY (collate_test1.b COLLATE "C"); | ORDER BY (b COLLATE "C");
collview3 | SELECT collate_test10.a, + collview3 | SELECT a, +
| lower(((collate_test10.x || collate_test10.x) COLLATE "C")) AS lower+ | lower(((x || x) COLLATE "C")) AS lower+
| FROM collate_test10; | FROM collate_test10;
(3 rows) (3 rows)

24
src/test/regress/expected/collate.linux.utf8.out
View File

@ -483,18 +483,18 @@ CREATE VIEW collview2 AS SELECT a, b FROM collate_test1 ORDER BY b COLLATE "C";
CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "C") FROM collate_test10; CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "C") FROM collate_test10;
SELECT table_name, view_definition FROM information_schema.views SELECT table_name, view_definition FROM information_schema.views
WHERE table_name LIKE 'collview%' ORDER BY 1; WHERE table_name LIKE 'collview%' ORDER BY 1;
table_name | view_definition table_name | view_definition
------------+-------------------------------------------------------------------------- ------------+--------------------------------------------
collview1 | SELECT collate_test1.a, + collview1 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| WHERE ((collate_test1.b COLLATE "C") >= 'bbc'::text); | WHERE ((b COLLATE "C") >= 'bbc'::text);
collview2 | SELECT collate_test1.a, + collview2 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| ORDER BY (collate_test1.b COLLATE "C"); | ORDER BY (b COLLATE "C");
collview3 | SELECT collate_test10.a, + collview3 | SELECT a, +
| lower(((collate_test10.x || collate_test10.x) COLLATE "C")) AS lower+ | lower(((x || x) COLLATE "C")) AS lower+
| FROM collate_test10; | FROM collate_test10;
(3 rows) (3 rows)

26
src/test/regress/expected/collate.out
View File

@ -194,18 +194,18 @@ CREATE VIEW collview2 AS SELECT a, b FROM collate_test1 ORDER BY b COLLATE "C";
CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "POSIX") FROM collate_test10; CREATE VIEW collview3 AS SELECT a, lower((x || x) COLLATE "POSIX") FROM collate_test10;
SELECT table_name, view_definition FROM information_schema.views SELECT table_name, view_definition FROM information_schema.views
WHERE table_name LIKE 'collview%' ORDER BY 1; WHERE table_name LIKE 'collview%' ORDER BY 1;
table_name | view_definition table_name | view_definition
------------+------------------------------------------------------------------------------ ------------+------------------------------------------------
collview1 | SELECT collate_test1.a, + collview1 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| WHERE ((collate_test1.b COLLATE "C") >= 'bbc'::text); | WHERE ((b COLLATE "C") >= 'bbc'::text);
collview2 | SELECT collate_test1.a, + collview2 | SELECT a, +
| collate_test1.b + | b +
| FROM collate_test1 + | FROM collate_test1 +
| ORDER BY (collate_test1.b COLLATE "C"); | ORDER BY (b COLLATE "C");
collview3 | SELECT collate_test10.a, + collview3 | SELECT a, +
| lower(((collate_test10.x || collate_test10.x) COLLATE "POSIX")) AS lower+ | lower(((x || x) COLLATE "POSIX")) AS lower+
| FROM collate_test10; | FROM collate_test10;
(3 rows) (3 rows)
@ -698,7 +698,7 @@ SELECT c1+1 AS c1p FROM
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
c1p | integer | | | | plain | c1p | integer | | | | plain |
View definition: View definition:
SELECT ss.c1 + 1 AS c1p SELECT c1 + 1 AS c1p
FROM ( SELECT 4 AS c1) ss; FROM ( SELECT 4 AS c1) ss;
-- Check conflicting or redundant options in CREATE COLLATION -- Check conflicting or redundant options in CREATE COLLATION

4
src/test/regress/expected/compression.out
View File

@ -187,7 +187,7 @@ CREATE MATERIALIZED VIEW compressmv(x) AS SELECT * FROM cmdata1;
--------+------+-----------+----------+---------+----------+-------------+--------------+------------- --------+------+-----------+----------+---------+----------+-------------+--------------+-------------
x | text | | | | extended | | | x | text | | | | extended | | |
View definition: View definition:
SELECT cmdata1.f1 AS x SELECT f1 AS x
FROM cmdata1; FROM cmdata1;
SELECT pg_column_compression(f1) FROM cmdata1; SELECT pg_column_compression(f1) FROM cmdata1;
@ -274,7 +274,7 @@ ALTER MATERIALIZED VIEW compressmv ALTER COLUMN x SET COMPRESSION lz4;
--------+------+-----------+----------+---------+----------+-------------+--------------+------------- --------+------+-----------+----------+---------+----------+-------------+--------------+-------------
x | text | | | | extended | lz4 | | x | text | | | | extended | lz4 | |
View definition: View definition:
SELECT cmdata1.f1 AS x SELECT f1 AS x
FROM cmdata1; FROM cmdata1;
-- test alter compression method for partitioned tables -- test alter compression method for partitioned tables

222
src/test/regress/expected/create_view.out
View File

@ -395,10 +395,10 @@ CREATE VIEW tt1 AS
c | numeric | | | | main | c | numeric | | | | main |
d | character varying(4) | | | | extended | d | character varying(4) | | | | extended |
View definition: View definition:
SELECT vv.a, SELECT a,
vv.b, b,
vv.c, c,
vv.d d
FROM ( VALUES ('abc'::character varying(3),'0123456789'::character varying,42,'abcd'::character varying(4)), ('0123456789'::character varying,'abc'::character varying(3),42.12,'abc'::character varying(4))) vv(a, b, c, d); FROM ( VALUES ('abc'::character varying(3),'0123456789'::character varying,42,'abcd'::character varying(4)), ('0123456789'::character varying,'abc'::character varying(3),42.12,'abc'::character varying(4))) vv(a, b, c, d);
SELECT * FROM tt1; SELECT * FROM tt1;
@ -440,9 +440,9 @@ CREATE VIEW aliased_view_4 AS
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT f1,
tt1.f2, f2,
tt1.f3 f3
FROM tt1 FROM tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tx1 FROM tx1
@ -456,9 +456,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM tt1 a1 FROM tt1 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tx1 FROM tx1
@ -472,9 +472,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT f1,
tt1.f2, f2,
tt1.f3 f3
FROM tt1 FROM tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tx1 a2 FROM tx1 a2
@ -488,9 +488,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT y1,
tt1.f2, f2,
tt1.f3 f3
FROM temp_view_test.tt1 FROM temp_view_test.tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 tt1_1 FROM tt1 tt1_1
@ -505,9 +505,9 @@ ALTER TABLE tx1 RENAME TO a1;
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT f1,
tt1.f2, f2,
tt1.f3 f3
FROM tt1 FROM tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 FROM a1
@ -521,9 +521,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM tt1 a1 FROM tt1 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 a1_1 FROM a1 a1_1
@ -537,9 +537,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT f1,
tt1.f2, f2,
tt1.f3 f3
FROM tt1 FROM tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 a2 FROM a1 a2
@ -553,9 +553,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT y1,
tt1.f2, f2,
tt1.f3 f3
FROM temp_view_test.tt1 FROM temp_view_test.tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 tt1_1 FROM tt1 tt1_1
@ -570,9 +570,9 @@ ALTER TABLE tt1 RENAME TO a2;
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT f1,
a2.f2, f2,
a2.f3 f3
FROM a2 FROM a2
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 FROM a1
@ -586,9 +586,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM a2 a1 FROM a2 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 a1_1 FROM a1 a1_1
@ -602,9 +602,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT f1,
a2.f2, f2,
a2.f3 f3
FROM a2 FROM a2
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a1 a2_1 FROM a1 a2_1
@ -618,9 +618,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT y1,
tt1.f2, f2,
tt1.f3 f3
FROM temp_view_test.tt1 FROM temp_view_test.tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a2 FROM a2
@ -635,9 +635,9 @@ ALTER TABLE a1 RENAME TO tt1;
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT f1,
a2.f2, f2,
a2.f3 f3
FROM a2 FROM a2
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -651,9 +651,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM a2 a1 FROM a2 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -667,9 +667,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT f1,
a2.f2, f2,
a2.f3 f3
FROM a2 FROM a2
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 a2_1 FROM tt1 a2_1
@ -683,9 +683,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT y1,
tt1.f2, f2,
tt1.f3 f3
FROM temp_view_test.tt1 FROM temp_view_test.tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM a2 FROM a2
@ -701,9 +701,9 @@ ALTER TABLE tx1 SET SCHEMA temp_view_test;
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT f1,
tx1.f2, f2,
tx1.f3 f3
FROM temp_view_test.tx1 FROM temp_view_test.tx1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -717,9 +717,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM temp_view_test.tx1 a1 FROM temp_view_test.tx1 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -733,9 +733,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT f1,
tx1.f2, f2,
tx1.f3 f3
FROM temp_view_test.tx1 FROM temp_view_test.tx1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 a2 FROM tt1 a2
@ -749,9 +749,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT y1,
tt1.f2, f2,
tt1.f3 f3
FROM temp_view_test.tt1 FROM temp_view_test.tt1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM temp_view_test.tx1 FROM temp_view_test.tx1
@ -768,9 +768,9 @@ ALTER TABLE tmp1 RENAME TO tx1;
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT f1,
tx1.f2, f2,
tx1.f3 f3
FROM temp_view_test.tx1 FROM temp_view_test.tx1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -784,9 +784,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT f1,
a1.f2, f2,
a1.f3 f3
FROM temp_view_test.tx1 a1 FROM temp_view_test.tx1 a1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 FROM tt1
@ -800,9 +800,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT f1,
tx1.f2, f2,
tx1.f3 f3
FROM temp_view_test.tx1 FROM temp_view_test.tx1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM tt1 a2 FROM tt1 a2
@ -816,9 +816,9 @@ View definition:
f2 | integer | | | | plain | f2 | integer | | | | plain |
f3 | text | | | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.y1, SELECT y1,
tx1.f2, f2,
tx1.f3 f3
FROM tx1 FROM tx1
WHERE (EXISTS ( SELECT 1 WHERE (EXISTS ( SELECT 1
FROM temp_view_test.tx1 tx1_1 FROM temp_view_test.tx1 tx1_1
@ -1305,10 +1305,10 @@ select pg_get_viewdef('v1', true);
select pg_get_viewdef('v4', true); select pg_get_viewdef('v4', true);
pg_get_viewdef pg_get_viewdef
---------------- ----------------
SELECT v1.b, + SELECT b, +
v1.c, + c, +
v1.x AS a,+ x AS a, +
v1.ax + ax +
FROM v1; FROM v1;
(1 row) (1 row)
@ -1585,9 +1585,9 @@ create view tt14v as select t.* from tt14f() t;
select pg_get_viewdef('tt14v', true); select pg_get_viewdef('tt14v', true);
pg_get_viewdef pg_get_viewdef
-------------------------------- --------------------------------
SELECT t.f1, + SELECT f1, +
t.f3, + f3, +
t.f4 + f4 +
FROM tt14f() t(f1, f3, f4); FROM tt14f() t(f1, f3, f4);
(1 row) (1 row)
@ -1623,11 +1623,11 @@ returning pg_describe_object(classid, objid, objsubid) as obj,
alter table tt14t drop column f3; alter table tt14t drop column f3;
-- column f3 is still in the view, sort of ... -- column f3 is still in the view, sort of ...
select pg_get_viewdef('tt14v', true); select pg_get_viewdef('tt14v', true);
pg_get_viewdef pg_get_viewdef
--------------------------------- -------------------------------
SELECT t.f1, + SELECT f1, +
t."?dropped?column?" AS f3,+ "?dropped?column?" AS f3,+
t.f4 + f4 +
FROM tt14f() t(f1, f4); FROM tt14f() t(f1, f4);
(1 row) (1 row)
@ -1675,9 +1675,9 @@ alter table tt14t alter column f4 type integer using f4::integer;
select pg_get_viewdef('tt14v', true); select pg_get_viewdef('tt14v', true);
pg_get_viewdef pg_get_viewdef
-------------------------------- --------------------------------
SELECT t.f1, + SELECT f1, +
t.f3, + f3, +
t.f4 + f4 +
FROM tt14f() t(f1, f3, f4); FROM tt14f() t(f1, f3, f4);
(1 row) (1 row)
@ -1697,8 +1697,8 @@ create view tt14v as select t.f1, t.f4 from tt14f() t;
select pg_get_viewdef('tt14v', true); select pg_get_viewdef('tt14v', true);
pg_get_viewdef pg_get_viewdef
-------------------------------- --------------------------------
SELECT t.f1, + SELECT f1, +
t.f4 + f4 +
FROM tt14f() t(f1, f3, f4); FROM tt14f() t(f1, f3, f4);
(1 row) (1 row)
@ -1712,8 +1712,8 @@ alter table tt14t drop column f3; -- ok
select pg_get_viewdef('tt14v', true); select pg_get_viewdef('tt14v', true);
pg_get_viewdef pg_get_viewdef
---------------------------- ----------------------------
SELECT t.f1, + SELECT f1, +
t.f4 + f4 +
FROM tt14f() t(f1, f4); FROM tt14f() t(f1, f4);
(1 row) (1 row)
@ -1806,8 +1806,8 @@ select * from tt17v;
select pg_get_viewdef('tt17v', true); select pg_get_viewdef('tt17v', true);
pg_get_viewdef pg_get_viewdef
--------------------------------------------- ---------------------------------------------
SELECT i.q1, + SELECT q1, +
i.q2 + q2 +
FROM int8_tbl i + FROM int8_tbl i +
WHERE (i.* IN ( VALUES (i.*::int8_tbl))); WHERE (i.* IN ( VALUES (i.*::int8_tbl)));
(1 row) (1 row)
@ -2134,7 +2134,7 @@ select pg_get_viewdef('tt25v', true);
WITH cte AS MATERIALIZED ( + WITH cte AS MATERIALIZED ( +
SELECT pg_get_keywords() AS k+ SELECT pg_get_keywords() AS k+
) + ) +
SELECT (cte.k).word AS word + SELECT (k).word AS word +
FROM cte; FROM cte;
(1 row) (1 row)
@ -2186,19 +2186,19 @@ select x + y + z as c1,
(x,y) <= ANY (values(1,2),(3,4)) as c11 (x,y) <= ANY (values(1,2),(3,4)) as c11
from (values(1,2,3)) v(x,y,z); from (values(1,2,3)) v(x,y,z);
select pg_get_viewdef('tt26v', true); select pg_get_viewdef('tt26v', true);
pg_get_viewdef pg_get_viewdef
-------------------------------------------------------- ----------------------------------------------------
SELECT v.x + v.y + v.z AS c1, + SELECT x + y + z AS c1, +
v.x * v.y + v.z AS c2, + x * y + z AS c2, +
v.x + v.y * v.z AS c3, + x + y * z AS c3, +
(v.x + v.y) * v.z AS c4, + (x + y) * z AS c4, +
v.x * (v.y + v.z) AS c5, + x * (y + z) AS c5, +
v.x + (v.y + v.z) AS c6, + x + (y + z) AS c6, +
v.x + (v.y # v.z) AS c7, + x + (y # z) AS c7, +
v.x > v.y AND (v.y > v.z OR v.x > v.z) AS c8, + x > y AND (y > z OR x > z) AS c8, +
v.x > v.y OR v.y > v.z AND NOT v.x > v.z AS c9, + x > y OR y > z AND NOT x > z AS c9, +
((v.x, v.y) <> ALL ( VALUES (1,2), (3,4))) AS c10,+ ((x, y) <> ALL ( VALUES (1,2), (3,4))) AS c10,+
((v.x, v.y) <= ANY ( VALUES (1,2), (3,4))) AS c11 + ((x, y) <= ANY ( VALUES (1,2), (3,4))) AS c11 +
FROM ( VALUES (1,2,3)) v(x, y, z); FROM ( VALUES (1,2,3)) v(x, y, z);
(1 row) (1 row)

24
src/test/regress/expected/expressions.out
View File

@ -137,12 +137,12 @@ create view numeric_view as
f2164 | numeric(16,4) | | | | main | f2164 | numeric(16,4) | | | | main |
f2n | numeric | | | | main | f2n | numeric | | | | main |
View definition: View definition:
SELECT numeric_tbl.f1, SELECT f1,
numeric_tbl.f1::numeric(16,4) AS f1164, f1::numeric(16,4) AS f1164,
numeric_tbl.f1::numeric AS f1n, f1::numeric AS f1n,
numeric_tbl.f2, f2,
numeric_tbl.f2::numeric(16,4) AS f2164, f2::numeric(16,4) AS f2164,
numeric_tbl.f2 AS f2n f2 AS f2n
FROM numeric_tbl; FROM numeric_tbl;
explain (verbose, costs off) select * from numeric_view; explain (verbose, costs off) select * from numeric_view;
@ -171,12 +171,12 @@ create view bpchar_view as
f214 | character(14) | | | | extended | f214 | character(14) | | | | extended |
f2n | bpchar | | | | extended | f2n | bpchar | | | | extended |
View definition: View definition:
SELECT bpchar_tbl.f1, SELECT f1,
bpchar_tbl.f1::character(14) AS f114, f1::character(14) AS f114,
bpchar_tbl.f1::bpchar AS f1n, f1::bpchar AS f1n,
bpchar_tbl.f2, f2,
bpchar_tbl.f2::character(14) AS f214, f2::character(14) AS f214,
bpchar_tbl.f2 AS f2n f2 AS f2n
FROM bpchar_tbl; FROM bpchar_tbl;
explain (verbose, costs off) select * from bpchar_view explain (verbose, costs off) select * from bpchar_view

20
src/test/regress/expected/groupingsets.out
View File

@ -570,16 +570,16 @@ CREATE VIEW gstest_view AS select a, b, grouping(a,b), sum(c), count(*), max(c)
from gstest2 group by rollup ((a,b,c),(c,d)); from gstest2 group by rollup ((a,b,c),(c,d));
NOTICE: view "gstest_view" will be a temporary view NOTICE: view "gstest_view" will be a temporary view
select pg_get_viewdef('gstest_view'::regclass, true); select pg_get_viewdef('gstest_view'::regclass, true);
pg_get_viewdef pg_get_viewdef
------------------------------------------------------------------------------- ---------------------------------------
SELECT gstest2.a, + SELECT a, +
gstest2.b, + b, +
GROUPING(gstest2.a, gstest2.b) AS "grouping", + GROUPING(a, b) AS "grouping", +
sum(gstest2.c) AS sum, + sum(c) AS sum, +
count(*) AS count, + count(*) AS count, +
max(gstest2.c) AS max + max(c) AS max +
FROM gstest2 + FROM gstest2 +
GROUP BY ROLLUP((gstest2.a, gstest2.b, gstest2.c), (gstest2.c, gstest2.d)); GROUP BY ROLLUP((a, b, c), (c, d));
(1 row) (1 row)
-- Nested queries with 3 or more levels of nesting -- Nested queries with 3 or more levels of nesting

24
src/test/regress/expected/limit.out
View File

@ -638,10 +638,10 @@ CREATE VIEW limit_thousand_v_1 AS SELECT thousand FROM onek WHERE thousand < 995
----------+---------+-----------+----------+---------+---------+------------- ----------+---------+-----------+----------+---------+---------+-------------
thousand | integer | | | | plain | thousand | integer | | | | plain |
View definition: View definition:
SELECT onek.thousand SELECT thousand
FROM onek FROM onek
WHERE onek.thousand < 995 WHERE thousand < 995
ORDER BY onek.thousand ORDER BY thousand
OFFSET 10 OFFSET 10
FETCH FIRST 5 ROWS WITH TIES; FETCH FIRST 5 ROWS WITH TIES;
@ -653,10 +653,10 @@ CREATE VIEW limit_thousand_v_2 AS SELECT thousand FROM onek WHERE thousand < 995
----------+---------+-----------+----------+---------+---------+------------- ----------+---------+-----------+----------+---------+---------+-------------
thousand | integer | | | | plain | thousand | integer | | | | plain |
View definition: View definition:
SELECT onek.thousand SELECT thousand
FROM onek FROM onek
WHERE onek.thousand < 995 WHERE thousand < 995
ORDER BY onek.thousand ORDER BY thousand
OFFSET 10 OFFSET 10
LIMIT 5; LIMIT 5;
@ -671,10 +671,10 @@ CREATE VIEW limit_thousand_v_3 AS SELECT thousand FROM onek WHERE thousand < 995
----------+---------+-----------+----------+---------+---------+------------- ----------+---------+-----------+----------+---------+---------+-------------
thousand | integer | | | | plain | thousand | integer | | | | plain |
View definition: View definition:
SELECT onek.thousand SELECT thousand
FROM onek FROM onek
WHERE onek.thousand < 995 WHERE thousand < 995
ORDER BY onek.thousand ORDER BY thousand
FETCH FIRST (NULL::integer + 1) ROWS WITH TIES; FETCH FIRST (NULL::integer + 1) ROWS WITH TIES;
CREATE VIEW limit_thousand_v_4 AS SELECT thousand FROM onek WHERE thousand < 995 CREATE VIEW limit_thousand_v_4 AS SELECT thousand FROM onek WHERE thousand < 995
@ -685,10 +685,10 @@ CREATE VIEW limit_thousand_v_4 AS SELECT thousand FROM onek WHERE thousand < 995
----------+---------+-----------+----------+---------+---------+------------- ----------+---------+-----------+----------+---------+---------+-------------
thousand | integer | | | | plain | thousand | integer | | | | plain |
View definition: View definition:
SELECT onek.thousand SELECT thousand
FROM onek FROM onek
WHERE onek.thousand < 995 WHERE thousand < 995
ORDER BY onek.thousand ORDER BY thousand
LIMIT ALL; LIMIT ALL;
-- leave these views -- leave these views

24
src/test/regress/expected/matview.out
View File

@ -100,10 +100,10 @@ CREATE INDEX mvtest_aa ON mvtest_bb (grandtot);
type | text | | | | extended | | type | text | | | | extended | |
totamt | numeric | | | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT type,
mvtest_tv.totamt totamt
FROM mvtest_tv FROM mvtest_tv
ORDER BY mvtest_tv.type; ORDER BY type;
\d+ mvtest_tvm \d+ mvtest_tvm
Materialized view "public.mvtest_tvm" Materialized view "public.mvtest_tvm"
@ -112,10 +112,10 @@ View definition:
type | text | | | | extended | | type | text | | | | extended | |
totamt | numeric | | | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT type,
mvtest_tv.totamt totamt
FROM mvtest_tv FROM mvtest_tv
ORDER BY mvtest_tv.type; ORDER BY type;
\d+ mvtest_tvvm \d+ mvtest_tvvm
Materialized view "public.mvtest_tvvm" Materialized view "public.mvtest_tvvm"
@ -123,7 +123,7 @@ View definition:
----------+---------+-----------+----------+---------+---------+--------------+------------- ----------+---------+-----------+----------+---------+---------+--------------+-------------
grandtot | numeric | | | | main | | grandtot | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tvv.grandtot SELECT grandtot
FROM mvtest_tvv; FROM mvtest_tvv;
\d+ mvtest_bb \d+ mvtest_bb
@ -134,7 +134,7 @@ View definition:
Indexes: Indexes:
"mvtest_aa" btree (grandtot) "mvtest_aa" btree (grandtot)
View definition: View definition:
SELECT mvtest_tvvmv.grandtot SELECT grandtot
FROM mvtest_tvvmv; FROM mvtest_tvvmv;
-- test schema behavior -- test schema behavior
@ -150,7 +150,7 @@ Indexes:
"mvtest_tvmm_expr" UNIQUE, btree ((grandtot > 0::numeric)) "mvtest_tvmm_expr" UNIQUE, btree ((grandtot > 0::numeric))
"mvtest_tvmm_pred" UNIQUE, btree (grandtot) WHERE grandtot < 0::numeric "mvtest_tvmm_pred" UNIQUE, btree (grandtot) WHERE grandtot < 0::numeric
View definition: View definition:
SELECT sum(mvtest_tvm.totamt) AS grandtot SELECT sum(totamt) AS grandtot
FROM mvtest_mvschema.mvtest_tvm; FROM mvtest_mvschema.mvtest_tvm;
SET search_path = mvtest_mvschema, public; SET search_path = mvtest_mvschema, public;
@ -161,10 +161,10 @@ SET search_path = mvtest_mvschema, public;
type | text | | | | extended | | type | text | | | | extended | |
totamt | numeric | | | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT type,
mvtest_tv.totamt totamt
FROM mvtest_tv FROM mvtest_tv
ORDER BY mvtest_tv.type; ORDER BY type;
-- modify the underlying table data -- modify the underlying table data
INSERT INTO mvtest_t VALUES (6, 'z', 13); INSERT INTO mvtest_t VALUES (6, 'z', 13);

8
src/test/regress/expected/polymorphism.out
View File

@ -1801,10 +1801,10 @@ select * from dfview;
c3 | bigint | | | | plain | c3 | bigint | | | | plain |
c4 | bigint | | | | plain | c4 | bigint | | | | plain |
View definition: View definition:
SELECT int8_tbl.q1, SELECT q1,
int8_tbl.q2, q2,
dfunc(int8_tbl.q1, int8_tbl.q2, flag => int8_tbl.q1 > int8_tbl.q2) AS c3, dfunc(q1, q2, flag => q1 > q2) AS c3,
dfunc(int8_tbl.q1, flag => int8_tbl.q1 < int8_tbl.q2, b => int8_tbl.q2) AS c4 dfunc(q1, flag => q1 < q2, b => q2) AS c4
FROM int8_tbl; FROM int8_tbl;
drop view dfview; drop view dfview;

34
src/test/regress/expected/rangefuncs.out
View File

@ -149,9 +149,9 @@ select * from vw_ord;
select definition from pg_views where viewname='vw_ord'; select definition from pg_views where viewname='vw_ord';
definition definition
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
SELECT z.a, + SELECT a, +
z.b, + b, +
z.c + c +
FROM UNNEST(ARRAY[10, 20], ARRAY['foo'::text, 'bar'::text], ARRAY[1.0]) z(a, b, c); FROM UNNEST(ARRAY[10, 20], ARRAY['foo'::text, 'bar'::text], ARRAY[1.0]) z(a, b, c);
(1 row) (1 row)
@ -167,9 +167,9 @@ select * from vw_ord;
select definition from pg_views where viewname='vw_ord'; select definition from pg_views where viewname='vw_ord';
definition definition
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
SELECT z.a, + SELECT a, +
z.b, + b, +
z.c + c +
FROM UNNEST(ARRAY[10, 20], ARRAY['foo'::text, 'bar'::text], ARRAY[1.0]) z(a, b, c); FROM UNNEST(ARRAY[10, 20], ARRAY['foo'::text, 'bar'::text], ARRAY[1.0]) z(a, b, c);
(1 row) (1 row)
@ -185,9 +185,9 @@ select * from vw_ord;
select definition from pg_views where viewname='vw_ord'; select definition from pg_views where viewname='vw_ord';
definition definition
---------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------
SELECT z.a, + SELECT a, +
z.b, + b, +
z.c + c +
FROM ROWS FROM(unnest(ARRAY[10, 20]), unnest(ARRAY['foo'::text, 'bar'::text]), generate_series(1, 2)) z(a, b, c); FROM ROWS FROM(unnest(ARRAY[10, 20]), unnest(ARRAY['foo'::text, 'bar'::text]), generate_series(1, 2)) z(a, b, c);
(1 row) (1 row)
@ -669,14 +669,14 @@ select * from vw_rngfunc;
select pg_get_viewdef('vw_rngfunc'); select pg_get_viewdef('vw_rngfunc');
pg_get_viewdef pg_get_viewdef
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
SELECT t1.a, + SELECT a, +
t1.b, + b, +
t1.c, + c, +
t1.d, + d, +
t1.e, + e, +
t1.f, + f, +
t1.g, + g, +
t1.n + n +
FROM ROWS FROM(getrngfunc9(1), getrngfunc7(1) AS (rngfuncid integer, rngfuncsubid integer, rngfuncname text), getrngfunc1(1)) WITH ORDINALITY t1(a, b, c, d, e, f, g, n); FROM ROWS FROM(getrngfunc9(1), getrngfunc7(1) AS (rngfuncid integer, rngfuncsubid integer, rngfuncname text), getrngfunc1(1)) WITH ORDINALITY t1(a, b, c, d, e, f, g, n);
(1 row) (1 row)

748
src/test/regress/expected/rules.out
View File

@ -1303,60 +1303,60 @@ pg_available_extensions| SELECT e.name,
e.comment e.comment
FROM (pg_available_extensions() e(name, default_version, comment) FROM (pg_available_extensions() e(name, default_version, comment)
LEFT JOIN pg_extension x ON ((e.name = x.extname))); LEFT JOIN pg_extension x ON ((e.name = x.extname)));
pg_backend_memory_contexts| SELECT pg_get_backend_memory_contexts.name, pg_backend_memory_contexts| SELECT name,
pg_get_backend_memory_contexts.ident, ident,
pg_get_backend_memory_contexts.parent, parent,
pg_get_backend_memory_contexts.level, level,
pg_get_backend_memory_contexts.total_bytes, total_bytes,
pg_get_backend_memory_contexts.total_nblocks, total_nblocks,
pg_get_backend_memory_contexts.free_bytes, free_bytes,
pg_get_backend_memory_contexts.free_chunks, free_chunks,
pg_get_backend_memory_contexts.used_bytes used_bytes
FROM pg_get_backend_memory_contexts() pg_get_backend_memory_contexts(name, ident, parent, level, total_bytes, total_nblocks, free_bytes, free_chunks, used_bytes); FROM pg_get_backend_memory_contexts() pg_get_backend_memory_contexts(name, ident, parent, level, total_bytes, total_nblocks, free_bytes, free_chunks, used_bytes);
pg_config| SELECT pg_config.name, pg_config| SELECT name,
pg_config.setting setting
FROM pg_config() pg_config(name, setting); FROM pg_config() pg_config(name, setting);
pg_cursors| SELECT c.name, pg_cursors| SELECT name,
c.statement, statement,
c.is_holdable, is_holdable,
c.is_binary, is_binary,
c.is_scrollable, is_scrollable,
c.creation_time creation_time
FROM pg_cursor() c(name, statement, is_holdable, is_binary, is_scrollable, creation_time); FROM pg_cursor() c(name, statement, is_holdable, is_binary, is_scrollable, creation_time);
pg_file_settings| SELECT a.sourcefile, pg_file_settings| SELECT sourcefile,
a.sourceline, sourceline,
a.seqno, seqno,
a.name, name,
a.setting, setting,
a.applied, applied,
a.error error
FROM pg_show_all_file_settings() a(sourcefile, sourceline, seqno, name, setting, applied, error); FROM pg_show_all_file_settings() a(sourcefile, sourceline, seqno, name, setting, applied, error);
pg_group| SELECT pg_authid.rolname AS groname, pg_group| SELECT rolname AS groname,
pg_authid.oid AS grosysid, oid AS grosysid,
ARRAY( SELECT pg_auth_members.member ARRAY( SELECT pg_auth_members.member
FROM pg_auth_members FROM pg_auth_members
WHERE (pg_auth_members.roleid = pg_authid.oid)) AS grolist WHERE (pg_auth_members.roleid = pg_authid.oid)) AS grolist
FROM pg_authid FROM pg_authid
WHERE (NOT pg_authid.rolcanlogin); WHERE (NOT rolcanlogin);
pg_hba_file_rules| SELECT a.rule_number, pg_hba_file_rules| SELECT rule_number,
a.file_name, file_name,
a.line_number, line_number,
a.type, type,
a.database, database,
a.user_name, user_name,
a.address, address,
a.netmask, netmask,
a.auth_method, auth_method,
a.options, options,
a.error error
FROM pg_hba_file_rules() a(rule_number, file_name, line_number, type, database, user_name, address, netmask, auth_method, options, error); FROM pg_hba_file_rules() a(rule_number, file_name, line_number, type, database, user_name, address, netmask, auth_method, options, error);
pg_ident_file_mappings| SELECT a.map_number, pg_ident_file_mappings| SELECT map_number,
a.file_name, file_name,
a.line_number, line_number,
a.map_name, map_name,
a.sys_name, sys_name,
a.pg_username, pg_username,
a.error error
FROM pg_ident_file_mappings() a(map_number, file_name, line_number, map_name, sys_name, pg_username, error); FROM pg_ident_file_mappings() a(map_number, file_name, line_number, map_name, sys_name, pg_username, error);
pg_indexes| SELECT n.nspname AS schemaname, pg_indexes| SELECT n.nspname AS schemaname,
c.relname AS tablename, c.relname AS tablename,
@ -1369,22 +1369,22 @@ pg_indexes| SELECT n.nspname AS schemaname,
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace))) LEFT JOIN pg_tablespace t ON ((t.oid = i.reltablespace)))
WHERE ((c.relkind = ANY (ARRAY['r'::"char", 'm'::"char", 'p'::"char"])) AND (i.relkind = ANY (ARRAY['i'::"char", 'I'::"char"]))); WHERE ((c.relkind = ANY (ARRAY['r'::"char", 'm'::"char", 'p'::"char"])) AND (i.relkind = ANY (ARRAY['i'::"char", 'I'::"char"])));
pg_locks| SELECT l.locktype, pg_locks| SELECT locktype,
l.database, database,
l.relation, relation,
l.page, page,
l.tuple, tuple,
l.virtualxid, virtualxid,
l.transactionid, transactionid,
l.classid, classid,
l.objid, objid,
l.objsubid, objsubid,
l.virtualtransaction, virtualtransaction,
l.pid, pid,
l.mode, mode,
l.granted, granted,
l.fastpath, fastpath,
l.waitstart waitstart
FROM pg_lock_status() l(locktype, database, relation, page, tuple, virtualxid, transactionid, classid, objid, objsubid, virtualtransaction, pid, mode, granted, fastpath, waitstart); FROM pg_lock_status() l(locktype, database, relation, page, tuple, virtualxid, transactionid, classid, objid, objsubid, virtualtransaction, pid, mode, granted, fastpath, waitstart);
pg_matviews| SELECT n.nspname AS schemaname, pg_matviews| SELECT n.nspname AS schemaname,
c.relname AS matviewname, c.relname AS matviewname,
@ -1424,14 +1424,14 @@ pg_policies| SELECT n.nspname AS schemaname,
FROM ((pg_policy pol FROM ((pg_policy pol
JOIN pg_class c ON ((c.oid = pol.polrelid))) JOIN pg_class c ON ((c.oid = pol.polrelid)))
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))); LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)));
pg_prepared_statements| SELECT p.name, pg_prepared_statements| SELECT name,
p.statement, statement,
p.prepare_time, prepare_time,
p.parameter_types, parameter_types,
p.result_types, result_types,
p.from_sql, from_sql,
p.generic_plans, generic_plans,
p.custom_plans custom_plans
FROM pg_prepared_statement() p(name, statement, prepare_time, parameter_types, result_types, from_sql, generic_plans, custom_plans); FROM pg_prepared_statement() p(name, statement, prepare_time, parameter_types, result_types, from_sql, generic_plans, custom_plans);
pg_prepared_xacts| SELECT p.transaction, pg_prepared_xacts| SELECT p.transaction,
p.gid, p.gid,
@ -1453,10 +1453,10 @@ pg_publication_tables| SELECT p.pubname,
(pg_class c (pg_class c
JOIN pg_namespace n ON ((n.oid = c.relnamespace))) JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
WHERE (c.oid = gpt.relid); WHERE (c.oid = gpt.relid);
pg_replication_origin_status| SELECT pg_show_replication_origin_status.local_id, pg_replication_origin_status| SELECT local_id,
pg_show_replication_origin_status.external_id, external_id,
pg_show_replication_origin_status.remote_lsn, remote_lsn,
pg_show_replication_origin_status.local_lsn local_lsn
FROM pg_show_replication_origin_status() pg_show_replication_origin_status(local_id, external_id, remote_lsn, local_lsn); FROM pg_show_replication_origin_status() pg_show_replication_origin_status(local_id, external_id, remote_lsn, local_lsn);
pg_replication_slots| SELECT l.slot_name, pg_replication_slots| SELECT l.slot_name,
l.plugin, l.plugin,
@ -1702,23 +1702,23 @@ pg_sequences| SELECT n.nspname AS schemaname,
JOIN pg_class c ON ((c.oid = s.seqrelid))) JOIN pg_class c ON ((c.oid = s.seqrelid)))
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
WHERE ((NOT pg_is_other_temp_schema(n.oid)) AND (c.relkind = 'S'::"char")); WHERE ((NOT pg_is_other_temp_schema(n.oid)) AND (c.relkind = 'S'::"char"));
pg_settings| SELECT a.name, pg_settings| SELECT name,
a.setting, setting,
a.unit, unit,
a.category, category,
a.short_desc, short_desc,
a.extra_desc, extra_desc,
a.context, context,
a.vartype, vartype,
a.source, source,
a.min_val, min_val,
a.max_val, max_val,
a.enumvals, enumvals,
a.boot_val, boot_val,
a.reset_val, reset_val,
a.sourcefile, sourcefile,
a.sourceline, sourceline,
a.pending_restart pending_restart
FROM pg_show_all_settings() a(name, setting, unit, category, short_desc, extra_desc, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, sourcefile, sourceline, pending_restart); FROM pg_show_all_settings() a(name, setting, unit, category, short_desc, extra_desc, context, vartype, source, min_val, max_val, enumvals, boot_val, reset_val, sourcefile, sourceline, pending_restart);
pg_shadow| SELECT pg_authid.rolname AS usename, pg_shadow| SELECT pg_authid.rolname AS usename,
pg_authid.oid AS usesysid, pg_authid.oid AS usesysid,
@ -1732,10 +1732,10 @@ pg_shadow| SELECT pg_authid.rolname AS usename,
FROM (pg_authid FROM (pg_authid
LEFT JOIN pg_db_role_setting s ON (((pg_authid.oid = s.setrole) AND (s.setdatabase = (0)::oid)))) LEFT JOIN pg_db_role_setting s ON (((pg_authid.oid = s.setrole) AND (s.setdatabase = (0)::oid))))
WHERE pg_authid.rolcanlogin; WHERE pg_authid.rolcanlogin;
pg_shmem_allocations| SELECT pg_get_shmem_allocations.name, pg_shmem_allocations| SELECT name,
pg_get_shmem_allocations.off, off,
pg_get_shmem_allocations.size, size,
pg_get_shmem_allocations.allocated_size allocated_size
FROM pg_get_shmem_allocations() pg_get_shmem_allocations(name, off, size, allocated_size); FROM pg_get_shmem_allocations() pg_get_shmem_allocations(name, off, size, allocated_size);
pg_stat_activity| SELECT s.datid, pg_stat_activity| SELECT s.datid,
d.datname, d.datname,
@ -1806,13 +1806,13 @@ pg_stat_all_tables| SELECT c.oid AS relid,
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char", 'p'::"char"])) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char", 'p'::"char"]))
GROUP BY c.oid, n.nspname, c.relname; GROUP BY c.oid, n.nspname, c.relname;
pg_stat_archiver| SELECT s.archived_count, pg_stat_archiver| SELECT archived_count,
s.last_archived_wal, last_archived_wal,
s.last_archived_time, last_archived_time,
s.failed_count, failed_count,
s.last_failed_wal, last_failed_wal,
s.last_failed_time, last_failed_time,
s.stats_reset stats_reset
FROM pg_stat_get_archiver() s(archived_count, last_archived_wal, last_archived_time, failed_count, last_failed_wal, last_failed_time, stats_reset); FROM pg_stat_get_archiver() s(archived_count, last_archived_wal, last_archived_time, failed_count, last_failed_wal, last_failed_time, stats_reset);
pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed, pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints_timed,
pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req, pg_stat_get_bgwriter_requested_checkpoints() AS checkpoints_req,
@ -1825,57 +1825,57 @@ pg_stat_bgwriter| SELECT pg_stat_get_bgwriter_timed_checkpoints() AS checkpoints
pg_stat_get_buf_fsync_backend() AS buffers_backend_fsync, pg_stat_get_buf_fsync_backend() AS buffers_backend_fsync,
pg_stat_get_buf_alloc() AS buffers_alloc, pg_stat_get_buf_alloc() AS buffers_alloc,
pg_stat_get_bgwriter_stat_reset_time() AS stats_reset; pg_stat_get_bgwriter_stat_reset_time() AS stats_reset;
pg_stat_database| SELECT d.oid AS datid, pg_stat_database| SELECT oid AS datid,
d.datname, datname,
CASE CASE
WHEN (d.oid = (0)::oid) THEN 0 WHEN (oid = (0)::oid) THEN 0
ELSE pg_stat_get_db_numbackends(d.oid) ELSE pg_stat_get_db_numbackends(oid)
END AS numbackends, END AS numbackends,
pg_stat_get_db_xact_commit(d.oid) AS xact_commit, pg_stat_get_db_xact_commit(oid) AS xact_commit,
pg_stat_get_db_xact_rollback(d.oid) AS xact_rollback, pg_stat_get_db_xact_rollback(oid) AS xact_rollback,
(pg_stat_get_db_blocks_fetched(d.oid) - pg_stat_get_db_blocks_hit(d.oid)) AS blks_read, (pg_stat_get_db_blocks_fetched(oid) - pg_stat_get_db_blocks_hit(oid)) AS blks_read,
pg_stat_get_db_blocks_hit(d.oid) AS blks_hit, pg_stat_get_db_blocks_hit(oid) AS blks_hit,
pg_stat_get_db_tuples_returned(d.oid) AS tup_returned, pg_stat_get_db_tuples_returned(oid) AS tup_returned,
pg_stat_get_db_tuples_fetched(d.oid) AS tup_fetched, pg_stat_get_db_tuples_fetched(oid) AS tup_fetched,
pg_stat_get_db_tuples_inserted(d.oid) AS tup_inserted, pg_stat_get_db_tuples_inserted(oid) AS tup_inserted,
pg_stat_get_db_tuples_updated(d.oid) AS tup_updated, pg_stat_get_db_tuples_updated(oid) AS tup_updated,
pg_stat_get_db_tuples_deleted(d.oid) AS tup_deleted, pg_stat_get_db_tuples_deleted(oid) AS tup_deleted,
pg_stat_get_db_conflict_all(d.oid) AS conflicts, pg_stat_get_db_conflict_all(oid) AS conflicts,
pg_stat_get_db_temp_files(d.oid) AS temp_files, pg_stat_get_db_temp_files(oid) AS temp_files,
pg_stat_get_db_temp_bytes(d.oid) AS temp_bytes, pg_stat_get_db_temp_bytes(oid) AS temp_bytes,
pg_stat_get_db_deadlocks(d.oid) AS deadlocks, pg_stat_get_db_deadlocks(oid) AS deadlocks,
pg_stat_get_db_checksum_failures(d.oid) AS checksum_failures, pg_stat_get_db_checksum_failures(oid) AS checksum_failures,
pg_stat_get_db_checksum_last_failure(d.oid) AS checksum_last_failure, pg_stat_get_db_checksum_last_failure(oid) AS checksum_last_failure,
pg_stat_get_db_blk_read_time(d.oid) AS blk_read_time, pg_stat_get_db_blk_read_time(oid) AS blk_read_time,
pg_stat_get_db_blk_write_time(d.oid) AS blk_write_time, pg_stat_get_db_blk_write_time(oid) AS blk_write_time,
pg_stat_get_db_session_time(d.oid) AS session_time, pg_stat_get_db_session_time(oid) AS session_time,
pg_stat_get_db_active_time(d.oid) AS active_time, pg_stat_get_db_active_time(oid) AS active_time,
pg_stat_get_db_idle_in_transaction_time(d.oid) AS idle_in_transaction_time, pg_stat_get_db_idle_in_transaction_time(oid) AS idle_in_transaction_time,
pg_stat_get_db_sessions(d.oid) AS sessions, pg_stat_get_db_sessions(oid) AS sessions,
pg_stat_get_db_sessions_abandoned(d.oid) AS sessions_abandoned, pg_stat_get_db_sessions_abandoned(oid) AS sessions_abandoned,
pg_stat_get_db_sessions_fatal(d.oid) AS sessions_fatal, pg_stat_get_db_sessions_fatal(oid) AS sessions_fatal,
pg_stat_get_db_sessions_killed(d.oid) AS sessions_killed, pg_stat_get_db_sessions_killed(oid) AS sessions_killed,
pg_stat_get_db_stat_reset_time(d.oid) AS stats_reset pg_stat_get_db_stat_reset_time(oid) AS stats_reset
FROM ( SELECT 0 AS oid, FROM ( SELECT 0 AS oid,
NULL::name AS datname NULL::name AS datname
UNION ALL UNION ALL
SELECT pg_database.oid, SELECT pg_database.oid,
pg_database.datname pg_database.datname
FROM pg_database) d; FROM pg_database) d;
pg_stat_database_conflicts| SELECT d.oid AS datid, pg_stat_database_conflicts| SELECT oid AS datid,
d.datname, datname,
pg_stat_get_db_conflict_tablespace(d.oid) AS confl_tablespace, pg_stat_get_db_conflict_tablespace(oid) AS confl_tablespace,
pg_stat_get_db_conflict_lock(d.oid) AS confl_lock, pg_stat_get_db_conflict_lock(oid) AS confl_lock,
pg_stat_get_db_conflict_snapshot(d.oid) AS confl_snapshot, pg_stat_get_db_conflict_snapshot(oid) AS confl_snapshot,
pg_stat_get_db_conflict_bufferpin(d.oid) AS confl_bufferpin, pg_stat_get_db_conflict_bufferpin(oid) AS confl_bufferpin,
pg_stat_get_db_conflict_startup_deadlock(d.oid) AS confl_deadlock pg_stat_get_db_conflict_startup_deadlock(oid) AS confl_deadlock
FROM pg_database d; FROM pg_database d;
pg_stat_gssapi| SELECT s.pid, pg_stat_gssapi| SELECT pid,
s.gss_auth AS gss_authenticated, gss_auth AS gss_authenticated,
s.gss_princ AS principal, gss_princ AS principal,
s.gss_enc AS encrypted gss_enc AS encrypted
FROM pg_stat_get_activity(NULL::integer) s(datid, pid, usesysid, application_name, state, query, wait_event_type, wait_event, xact_start, query_start, backend_start, state_change, client_addr, client_hostname, client_port, backend_xid, backend_xmin, backend_type, ssl, sslversion, sslcipher, sslbits, ssl_client_dn, ssl_client_serial, ssl_issuer_dn, gss_auth, gss_princ, gss_enc, leader_pid, query_id) FROM pg_stat_get_activity(NULL::integer) s(datid, pid, usesysid, application_name, state, query, wait_event_type, wait_event, xact_start, query_start, backend_start, state_change, client_addr, client_hostname, client_port, backend_xid, backend_xmin, backend_type, ssl, sslversion, sslcipher, sslbits, ssl_client_dn, ssl_client_serial, ssl_issuer_dn, gss_auth, gss_princ, gss_enc, leader_pid, query_id)
WHERE (s.client_port IS NOT NULL); WHERE (client_port IS NOT NULL);
pg_stat_progress_analyze| SELECT s.pid, pg_stat_progress_analyze| SELECT s.pid,
s.datid, s.datid,
d.datname, d.datname,
@ -1898,8 +1898,8 @@ pg_stat_progress_analyze| SELECT s.pid,
(s.param8)::oid AS current_child_table_relid (s.param8)::oid AS current_child_table_relid
FROM (pg_stat_get_progress_info('ANALYZE'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) FROM (pg_stat_get_progress_info('ANALYZE'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20)
LEFT JOIN pg_database d ON ((s.datid = d.oid))); LEFT JOIN pg_database d ON ((s.datid = d.oid)));
pg_stat_progress_basebackup| SELECT s.pid, pg_stat_progress_basebackup| SELECT pid,
CASE s.param1 CASE param1
WHEN 0 THEN 'initializing'::text WHEN 0 THEN 'initializing'::text
WHEN 1 THEN 'waiting for checkpoint to finish'::text WHEN 1 THEN 'waiting for checkpoint to finish'::text
WHEN 2 THEN 'estimating backup size'::text WHEN 2 THEN 'estimating backup size'::text
@ -1908,13 +1908,13 @@ pg_stat_progress_basebackup| SELECT s.pid,
WHEN 5 THEN 'transferring wal files'::text WHEN 5 THEN 'transferring wal files'::text
ELSE NULL::text ELSE NULL::text
END AS phase, END AS phase,
CASE s.param2 CASE param2
WHEN '-1'::integer THEN NULL::bigint WHEN '-1'::integer THEN NULL::bigint
ELSE s.param2 ELSE param2
END AS backup_total, END AS backup_total,
s.param3 AS backup_streamed, param3 AS backup_streamed,
s.param4 AS tablespaces_total, param4 AS tablespaces_total,
s.param5 AS tablespaces_streamed param5 AS tablespaces_streamed
FROM pg_stat_get_progress_info('BASEBACKUP'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20); FROM pg_stat_get_progress_info('BASEBACKUP'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20);
pg_stat_progress_cluster| SELECT s.pid, pg_stat_progress_cluster| SELECT s.pid,
s.datid, s.datid,
@ -2024,16 +2024,16 @@ pg_stat_progress_vacuum| SELECT s.pid,
s.param7 AS num_dead_tuples s.param7 AS num_dead_tuples
FROM (pg_stat_get_progress_info('VACUUM'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20) FROM (pg_stat_get_progress_info('VACUUM'::text) s(pid, datid, relid, param1, param2, param3, param4, param5, param6, param7, param8, param9, param10, param11, param12, param13, param14, param15, param16, param17, param18, param19, param20)
LEFT JOIN pg_database d ON ((s.datid = d.oid))); LEFT JOIN pg_database d ON ((s.datid = d.oid)));
pg_stat_recovery_prefetch| SELECT s.stats_reset, pg_stat_recovery_prefetch| SELECT stats_reset,
s.prefetch, prefetch,
s.hit, hit,
s.skip_init, skip_init,
s.skip_new, skip_new,
s.skip_fpw, skip_fpw,
s.skip_rep, skip_rep,
s.wal_distance, wal_distance,
s.block_distance, block_distance,
s.io_depth io_depth
FROM pg_stat_get_recovery_prefetch() s(stats_reset, prefetch, hit, skip_init, skip_new, skip_fpw, skip_rep, wal_distance, block_distance, io_depth); FROM pg_stat_get_recovery_prefetch() s(stats_reset, prefetch, hit, skip_init, skip_new, skip_fpw, skip_rep, wal_distance, block_distance, io_depth);
pg_stat_replication| SELECT s.pid, pg_stat_replication| SELECT s.pid,
s.usesysid, s.usesysid,
@ -2071,26 +2071,26 @@ pg_stat_replication_slots| SELECT s.slot_name,
FROM pg_replication_slots r, FROM pg_replication_slots r,
LATERAL pg_stat_get_replication_slot((r.slot_name)::text) s(slot_name, spill_txns, spill_count, spill_bytes, stream_txns, stream_count, stream_bytes, total_txns, total_bytes, stats_reset) LATERAL pg_stat_get_replication_slot((r.slot_name)::text) s(slot_name, spill_txns, spill_count, spill_bytes, stream_txns, stream_count, stream_bytes, total_txns, total_bytes, stats_reset)
WHERE (r.datoid IS NOT NULL); WHERE (r.datoid IS NOT NULL);
pg_stat_slru| SELECT s.name, pg_stat_slru| SELECT name,
s.blks_zeroed, blks_zeroed,
s.blks_hit, blks_hit,
s.blks_read, blks_read,
s.blks_written, blks_written,
s.blks_exists, blks_exists,
s.flushes, flushes,
s.truncates, truncates,
s.stats_reset stats_reset
FROM pg_stat_get_slru() s(name, blks_zeroed, blks_hit, blks_read, blks_written, blks_exists, flushes, truncates, stats_reset); FROM pg_stat_get_slru() s(name, blks_zeroed, blks_hit, blks_read, blks_written, blks_exists, flushes, truncates, stats_reset);
pg_stat_ssl| SELECT s.pid, pg_stat_ssl| SELECT pid,
s.ssl, ssl,
s.sslversion AS version, sslversion AS version,
s.sslcipher AS cipher, sslcipher AS cipher,
s.sslbits AS bits, sslbits AS bits,
s.ssl_client_dn AS client_dn, ssl_client_dn AS client_dn,
s.ssl_client_serial AS client_serial, ssl_client_serial AS client_serial,
s.ssl_issuer_dn AS issuer_dn ssl_issuer_dn AS issuer_dn
FROM pg_stat_get_activity(NULL::integer) s(datid, pid, usesysid, application_name, state, query, wait_event_type, wait_event, xact_start, query_start, backend_start, state_change, client_addr, client_hostname, client_port, backend_xid, backend_xmin, backend_type, ssl, sslversion, sslcipher, sslbits, ssl_client_dn, ssl_client_serial, ssl_issuer_dn, gss_auth, gss_princ, gss_enc, leader_pid, query_id) FROM pg_stat_get_activity(NULL::integer) s(datid, pid, usesysid, application_name, state, query, wait_event_type, wait_event, xact_start, query_start, backend_start, state_change, client_addr, client_hostname, client_port, backend_xid, backend_xmin, backend_type, ssl, sslversion, sslcipher, sslbits, ssl_client_dn, ssl_client_serial, ssl_issuer_dn, gss_auth, gss_princ, gss_enc, leader_pid, query_id)
WHERE (s.client_port IS NOT NULL); WHERE (client_port IS NOT NULL);
pg_stat_subscription| SELECT su.oid AS subid, pg_stat_subscription| SELECT su.oid AS subid,
su.subname, su.subname,
st.pid, st.pid,
@ -2109,44 +2109,44 @@ pg_stat_subscription_stats| SELECT ss.subid,
ss.stats_reset ss.stats_reset
FROM pg_subscription s, FROM pg_subscription s,
LATERAL pg_stat_get_subscription_stats(s.oid) ss(subid, apply_error_count, sync_error_count, stats_reset); LATERAL pg_stat_get_subscription_stats(s.oid) ss(subid, apply_error_count, sync_error_count, stats_reset);
pg_stat_sys_indexes| SELECT pg_stat_all_indexes.relid, pg_stat_sys_indexes| SELECT relid,
pg_stat_all_indexes.indexrelid, indexrelid,
pg_stat_all_indexes.schemaname, schemaname,
pg_stat_all_indexes.relname, relname,
pg_stat_all_indexes.indexrelname, indexrelname,
pg_stat_all_indexes.idx_scan, idx_scan,
pg_stat_all_indexes.last_idx_scan, last_idx_scan,
pg_stat_all_indexes.idx_tup_read, idx_tup_read,
pg_stat_all_indexes.idx_tup_fetch idx_tup_fetch
FROM pg_stat_all_indexes FROM pg_stat_all_indexes
WHERE ((pg_stat_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_stat_all_indexes.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_stat_sys_tables| SELECT pg_stat_all_tables.relid, pg_stat_sys_tables| SELECT relid,
pg_stat_all_tables.schemaname, schemaname,
pg_stat_all_tables.relname, relname,
pg_stat_all_tables.seq_scan, seq_scan,
pg_stat_all_tables.last_seq_scan, last_seq_scan,
pg_stat_all_tables.seq_tup_read, seq_tup_read,
pg_stat_all_tables.idx_scan, idx_scan,
pg_stat_all_tables.last_idx_scan, last_idx_scan,
pg_stat_all_tables.idx_tup_fetch, idx_tup_fetch,
pg_stat_all_tables.n_tup_ins, n_tup_ins,
pg_stat_all_tables.n_tup_upd, n_tup_upd,
pg_stat_all_tables.n_tup_del, n_tup_del,
pg_stat_all_tables.n_tup_hot_upd, n_tup_hot_upd,
pg_stat_all_tables.n_live_tup, n_live_tup,
pg_stat_all_tables.n_dead_tup, n_dead_tup,
pg_stat_all_tables.n_mod_since_analyze, n_mod_since_analyze,
pg_stat_all_tables.n_ins_since_vacuum, n_ins_since_vacuum,
pg_stat_all_tables.last_vacuum, last_vacuum,
pg_stat_all_tables.last_autovacuum, last_autovacuum,
pg_stat_all_tables.last_analyze, last_analyze,
pg_stat_all_tables.last_autoanalyze, last_autoanalyze,
pg_stat_all_tables.vacuum_count, vacuum_count,
pg_stat_all_tables.autovacuum_count, autovacuum_count,
pg_stat_all_tables.analyze_count, analyze_count,
pg_stat_all_tables.autoanalyze_count autoanalyze_count
FROM pg_stat_all_tables FROM pg_stat_all_tables
WHERE ((pg_stat_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_stat_all_tables.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_stat_user_functions| SELECT p.oid AS funcid, pg_stat_user_functions| SELECT p.oid AS funcid,
n.nspname AS schemaname, n.nspname AS schemaname,
p.proname AS funcname, p.proname AS funcname,
@ -2156,71 +2156,71 @@ pg_stat_user_functions| SELECT p.oid AS funcid,
FROM (pg_proc p FROM (pg_proc p
LEFT JOIN pg_namespace n ON ((n.oid = p.pronamespace))) LEFT JOIN pg_namespace n ON ((n.oid = p.pronamespace)))
WHERE ((p.prolang <> (12)::oid) AND (pg_stat_get_function_calls(p.oid) IS NOT NULL)); WHERE ((p.prolang <> (12)::oid) AND (pg_stat_get_function_calls(p.oid) IS NOT NULL));
pg_stat_user_indexes| SELECT pg_stat_all_indexes.relid, pg_stat_user_indexes| SELECT relid,
pg_stat_all_indexes.indexrelid, indexrelid,
pg_stat_all_indexes.schemaname, schemaname,
pg_stat_all_indexes.relname, relname,
pg_stat_all_indexes.indexrelname, indexrelname,
pg_stat_all_indexes.idx_scan, idx_scan,
pg_stat_all_indexes.last_idx_scan, last_idx_scan,
pg_stat_all_indexes.idx_tup_read, idx_tup_read,
pg_stat_all_indexes.idx_tup_fetch idx_tup_fetch
FROM pg_stat_all_indexes FROM pg_stat_all_indexes
WHERE ((pg_stat_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_all_indexes.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_stat_user_tables| SELECT pg_stat_all_tables.relid, pg_stat_user_tables| SELECT relid,
pg_stat_all_tables.schemaname, schemaname,
pg_stat_all_tables.relname, relname,
pg_stat_all_tables.seq_scan, seq_scan,
pg_stat_all_tables.last_seq_scan, last_seq_scan,
pg_stat_all_tables.seq_tup_read, seq_tup_read,
pg_stat_all_tables.idx_scan, idx_scan,
pg_stat_all_tables.last_idx_scan, last_idx_scan,
pg_stat_all_tables.idx_tup_fetch, idx_tup_fetch,
pg_stat_all_tables.n_tup_ins, n_tup_ins,
pg_stat_all_tables.n_tup_upd, n_tup_upd,
pg_stat_all_tables.n_tup_del, n_tup_del,
pg_stat_all_tables.n_tup_hot_upd, n_tup_hot_upd,
pg_stat_all_tables.n_live_tup, n_live_tup,
pg_stat_all_tables.n_dead_tup, n_dead_tup,
pg_stat_all_tables.n_mod_since_analyze, n_mod_since_analyze,
pg_stat_all_tables.n_ins_since_vacuum, n_ins_since_vacuum,
pg_stat_all_tables.last_vacuum, last_vacuum,
pg_stat_all_tables.last_autovacuum, last_autovacuum,
pg_stat_all_tables.last_analyze, last_analyze,
pg_stat_all_tables.last_autoanalyze, last_autoanalyze,
pg_stat_all_tables.vacuum_count, vacuum_count,
pg_stat_all_tables.autovacuum_count, autovacuum_count,
pg_stat_all_tables.analyze_count, analyze_count,
pg_stat_all_tables.autoanalyze_count autoanalyze_count
FROM pg_stat_all_tables FROM pg_stat_all_tables
WHERE ((pg_stat_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_all_tables.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_stat_wal| SELECT w.wal_records, pg_stat_wal| SELECT wal_records,
w.wal_fpi, wal_fpi,
w.wal_bytes, wal_bytes,
w.wal_buffers_full, wal_buffers_full,
w.wal_write, wal_write,
w.wal_sync, wal_sync,
w.wal_write_time, wal_write_time,
w.wal_sync_time, wal_sync_time,
w.stats_reset stats_reset
FROM pg_stat_get_wal() w(wal_records, wal_fpi, wal_bytes, wal_buffers_full, wal_write, wal_sync, wal_write_time, wal_sync_time, stats_reset); FROM pg_stat_get_wal() w(wal_records, wal_fpi, wal_bytes, wal_buffers_full, wal_write, wal_sync, wal_write_time, wal_sync_time, stats_reset);
pg_stat_wal_receiver| SELECT s.pid, pg_stat_wal_receiver| SELECT pid,
s.status, status,
s.receive_start_lsn, receive_start_lsn,
s.receive_start_tli, receive_start_tli,
s.written_lsn, written_lsn,
s.flushed_lsn, flushed_lsn,
s.received_tli, received_tli,
s.last_msg_send_time, last_msg_send_time,
s.last_msg_receipt_time, last_msg_receipt_time,
s.latest_end_lsn, latest_end_lsn,
s.latest_end_time, latest_end_time,
s.slot_name, slot_name,
s.sender_host, sender_host,
s.sender_port, sender_port,
s.conninfo conninfo
FROM pg_stat_get_wal_receiver() s(pid, status, receive_start_lsn, receive_start_tli, written_lsn, flushed_lsn, received_tli, last_msg_send_time, last_msg_receipt_time, latest_end_lsn, latest_end_time, slot_name, sender_host, sender_port, conninfo) FROM pg_stat_get_wal_receiver() s(pid, status, receive_start_lsn, receive_start_tli, written_lsn, flushed_lsn, received_tli, last_msg_send_time, last_msg_receipt_time, latest_end_lsn, latest_end_time, slot_name, sender_host, sender_port, conninfo)
WHERE (s.pid IS NOT NULL); WHERE (pid IS NOT NULL);
pg_stat_xact_all_tables| SELECT c.oid AS relid, pg_stat_xact_all_tables| SELECT c.oid AS relid,
n.nspname AS schemaname, n.nspname AS schemaname,
c.relname, c.relname,
@ -2237,19 +2237,19 @@ pg_stat_xact_all_tables| SELECT c.oid AS relid,
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char", 'p'::"char"])) WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char", 'p'::"char"]))
GROUP BY c.oid, n.nspname, c.relname; GROUP BY c.oid, n.nspname, c.relname;
pg_stat_xact_sys_tables| SELECT pg_stat_xact_all_tables.relid, pg_stat_xact_sys_tables| SELECT relid,
pg_stat_xact_all_tables.schemaname, schemaname,
pg_stat_xact_all_tables.relname, relname,
pg_stat_xact_all_tables.seq_scan, seq_scan,
pg_stat_xact_all_tables.seq_tup_read, seq_tup_read,
pg_stat_xact_all_tables.idx_scan, idx_scan,
pg_stat_xact_all_tables.idx_tup_fetch, idx_tup_fetch,
pg_stat_xact_all_tables.n_tup_ins, n_tup_ins,
pg_stat_xact_all_tables.n_tup_upd, n_tup_upd,
pg_stat_xact_all_tables.n_tup_del, n_tup_del,
pg_stat_xact_all_tables.n_tup_hot_upd n_tup_hot_upd
FROM pg_stat_xact_all_tables FROM pg_stat_xact_all_tables
WHERE ((pg_stat_xact_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_stat_xact_all_tables.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_stat_xact_user_functions| SELECT p.oid AS funcid, pg_stat_xact_user_functions| SELECT p.oid AS funcid,
n.nspname AS schemaname, n.nspname AS schemaname,
p.proname AS funcname, p.proname AS funcname,
@ -2259,19 +2259,19 @@ pg_stat_xact_user_functions| SELECT p.oid AS funcid,
FROM (pg_proc p FROM (pg_proc p
LEFT JOIN pg_namespace n ON ((n.oid = p.pronamespace))) LEFT JOIN pg_namespace n ON ((n.oid = p.pronamespace)))
WHERE ((p.prolang <> (12)::oid) AND (pg_stat_get_xact_function_calls(p.oid) IS NOT NULL)); WHERE ((p.prolang <> (12)::oid) AND (pg_stat_get_xact_function_calls(p.oid) IS NOT NULL));
pg_stat_xact_user_tables| SELECT pg_stat_xact_all_tables.relid, pg_stat_xact_user_tables| SELECT relid,
pg_stat_xact_all_tables.schemaname, schemaname,
pg_stat_xact_all_tables.relname, relname,
pg_stat_xact_all_tables.seq_scan, seq_scan,
pg_stat_xact_all_tables.seq_tup_read, seq_tup_read,
pg_stat_xact_all_tables.idx_scan, idx_scan,
pg_stat_xact_all_tables.idx_tup_fetch, idx_tup_fetch,
pg_stat_xact_all_tables.n_tup_ins, n_tup_ins,
pg_stat_xact_all_tables.n_tup_upd, n_tup_upd,
pg_stat_xact_all_tables.n_tup_del, n_tup_del,
pg_stat_xact_all_tables.n_tup_hot_upd n_tup_hot_upd
FROM pg_stat_xact_all_tables FROM pg_stat_xact_all_tables
WHERE ((pg_stat_xact_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_stat_xact_all_tables.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_statio_all_indexes| SELECT c.oid AS relid, pg_statio_all_indexes| SELECT c.oid AS relid,
i.oid AS indexrelid, i.oid AS indexrelid,
n.nspname AS schemaname, n.nspname AS schemaname,
@ -2315,64 +2315,64 @@ pg_statio_all_tables| SELECT c.oid AS relid,
FROM pg_index FROM pg_index
WHERE (pg_index.indrelid = t.oid)) x ON (true)) WHERE (pg_index.indrelid = t.oid)) x ON (true))
WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char"])); WHERE (c.relkind = ANY (ARRAY['r'::"char", 't'::"char", 'm'::"char"]));
pg_statio_sys_indexes| SELECT pg_statio_all_indexes.relid, pg_statio_sys_indexes| SELECT relid,
pg_statio_all_indexes.indexrelid, indexrelid,
pg_statio_all_indexes.schemaname, schemaname,
pg_statio_all_indexes.relname, relname,
pg_statio_all_indexes.indexrelname, indexrelname,
pg_statio_all_indexes.idx_blks_read, idx_blks_read,
pg_statio_all_indexes.idx_blks_hit idx_blks_hit
FROM pg_statio_all_indexes FROM pg_statio_all_indexes
WHERE ((pg_statio_all_indexes.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_indexes.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_statio_sys_sequences| SELECT pg_statio_all_sequences.relid, pg_statio_sys_sequences| SELECT relid,
pg_statio_all_sequences.schemaname, schemaname,
pg_statio_all_sequences.relname, relname,
pg_statio_all_sequences.blks_read, blks_read,
pg_statio_all_sequences.blks_hit blks_hit
FROM pg_statio_all_sequences FROM pg_statio_all_sequences
WHERE ((pg_statio_all_sequences.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_sequences.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_statio_sys_tables| SELECT pg_statio_all_tables.relid, pg_statio_sys_tables| SELECT relid,
pg_statio_all_tables.schemaname, schemaname,
pg_statio_all_tables.relname, relname,
pg_statio_all_tables.heap_blks_read, heap_blks_read,
pg_statio_all_tables.heap_blks_hit, heap_blks_hit,
pg_statio_all_tables.idx_blks_read, idx_blks_read,
pg_statio_all_tables.idx_blks_hit, idx_blks_hit,
pg_statio_all_tables.toast_blks_read, toast_blks_read,
pg_statio_all_tables.toast_blks_hit, toast_blks_hit,
pg_statio_all_tables.tidx_blks_read, tidx_blks_read,
pg_statio_all_tables.tidx_blks_hit tidx_blks_hit
FROM pg_statio_all_tables FROM pg_statio_all_tables
WHERE ((pg_statio_all_tables.schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (pg_statio_all_tables.schemaname ~ '^pg_toast'::text)); WHERE ((schemaname = ANY (ARRAY['pg_catalog'::name, 'information_schema'::name])) OR (schemaname ~ '^pg_toast'::text));
pg_statio_user_indexes| SELECT pg_statio_all_indexes.relid, pg_statio_user_indexes| SELECT relid,
pg_statio_all_indexes.indexrelid, indexrelid,
pg_statio_all_indexes.schemaname, schemaname,
pg_statio_all_indexes.relname, relname,
pg_statio_all_indexes.indexrelname, indexrelname,
pg_statio_all_indexes.idx_blks_read, idx_blks_read,
pg_statio_all_indexes.idx_blks_hit idx_blks_hit
FROM pg_statio_all_indexes FROM pg_statio_all_indexes
WHERE ((pg_statio_all_indexes.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_indexes.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_statio_user_sequences| SELECT pg_statio_all_sequences.relid, pg_statio_user_sequences| SELECT relid,
pg_statio_all_sequences.schemaname, schemaname,
pg_statio_all_sequences.relname, relname,
pg_statio_all_sequences.blks_read, blks_read,
pg_statio_all_sequences.blks_hit blks_hit
FROM pg_statio_all_sequences FROM pg_statio_all_sequences
WHERE ((pg_statio_all_sequences.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_sequences.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_statio_user_tables| SELECT pg_statio_all_tables.relid, pg_statio_user_tables| SELECT relid,
pg_statio_all_tables.schemaname, schemaname,
pg_statio_all_tables.relname, relname,
pg_statio_all_tables.heap_blks_read, heap_blks_read,
pg_statio_all_tables.heap_blks_hit, heap_blks_hit,
pg_statio_all_tables.idx_blks_read, idx_blks_read,
pg_statio_all_tables.idx_blks_hit, idx_blks_hit,
pg_statio_all_tables.toast_blks_read, toast_blks_read,
pg_statio_all_tables.toast_blks_hit, toast_blks_hit,
pg_statio_all_tables.tidx_blks_read, tidx_blks_read,
pg_statio_all_tables.tidx_blks_hit tidx_blks_hit
FROM pg_statio_all_tables FROM pg_statio_all_tables
WHERE ((pg_statio_all_tables.schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (pg_statio_all_tables.schemaname !~ '^pg_toast'::text)); WHERE ((schemaname <> ALL (ARRAY['pg_catalog'::name, 'information_schema'::name])) AND (schemaname !~ '^pg_toast'::text));
pg_stats| SELECT n.nspname AS schemaname, pg_stats| SELECT n.nspname AS schemaname,
c.relname AS tablename, c.relname AS tablename,
a.attname, a.attname,
@ -2557,24 +2557,24 @@ pg_tables| SELECT n.nspname AS schemaname,
LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace))) LEFT JOIN pg_namespace n ON ((n.oid = c.relnamespace)))
LEFT JOIN pg_tablespace t ON ((t.oid = c.reltablespace))) LEFT JOIN pg_tablespace t ON ((t.oid = c.reltablespace)))
WHERE (c.relkind = ANY (ARRAY['r'::"char", 'p'::"char"])); WHERE (c.relkind = ANY (ARRAY['r'::"char", 'p'::"char"]));
pg_timezone_abbrevs| SELECT pg_timezone_abbrevs.abbrev, pg_timezone_abbrevs| SELECT abbrev,
pg_timezone_abbrevs.utc_offset, utc_offset,
pg_timezone_abbrevs.is_dst is_dst
FROM pg_timezone_abbrevs() pg_timezone_abbrevs(abbrev, utc_offset, is_dst); FROM pg_timezone_abbrevs() pg_timezone_abbrevs(abbrev, utc_offset, is_dst);
pg_timezone_names| SELECT pg_timezone_names.name, pg_timezone_names| SELECT name,
pg_timezone_names.abbrev, abbrev,
pg_timezone_names.utc_offset, utc_offset,
pg_timezone_names.is_dst is_dst
FROM pg_timezone_names() pg_timezone_names(name, abbrev, utc_offset, is_dst); FROM pg_timezone_names() pg_timezone_names(name, abbrev, utc_offset, is_dst);
pg_user| SELECT pg_shadow.usename, pg_user| SELECT usename,
pg_shadow.usesysid, usesysid,
pg_shadow.usecreatedb, usecreatedb,
pg_shadow.usesuper, usesuper,
pg_shadow.userepl, userepl,
pg_shadow.usebypassrls, usebypassrls,
'********'::text AS passwd, '********'::text AS passwd,
pg_shadow.valuntil, valuntil,
pg_shadow.useconfig useconfig
FROM pg_shadow; FROM pg_shadow;
pg_user_mappings| SELECT u.oid AS umid, pg_user_mappings| SELECT u.oid AS umid,
s.oid AS srvid, s.oid AS srvid,
@ -3079,7 +3079,7 @@ SELECT * FROM rule_v1;
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rule_t1.a SELECT a
FROM rule_t1; FROM rule_t1;
Rules: Rules:
newinsertrule AS newinsertrule AS
@ -3118,8 +3118,8 @@ alter table rule_v1 rename column column2 to q2;
column1 | integer | | | | plain | column1 | integer | | | | plain |
q2 | integer | | | | plain | q2 | integer | | | | plain |
View definition: View definition:
SELECT "*VALUES*".column1, SELECT column1,
"*VALUES*".column2 AS q2 column2 AS q2
FROM (VALUES (1,2)) "*VALUES*"; FROM (VALUES (1,2)) "*VALUES*";
drop view rule_v1; drop view rule_v1;
@ -3131,8 +3131,8 @@ create view rule_v1(x) as values(1,2);
x | integer | | | | plain | x | integer | | | | plain |
column2 | integer | | | | plain | column2 | integer | | | | plain |
View definition: View definition:
SELECT "*VALUES*".column1 AS x, SELECT column1 AS x,
"*VALUES*".column2 column2
FROM (VALUES (1,2)) "*VALUES*"; FROM (VALUES (1,2)) "*VALUES*";
drop view rule_v1; drop view rule_v1;
@ -3144,8 +3144,8 @@ create view rule_v1(x) as select * from (values(1,2)) v;
x | integer | | | | plain | x | integer | | | | plain |
column2 | integer | | | | plain | column2 | integer | | | | plain |
View definition: View definition:
SELECT v.column1 AS x, SELECT column1 AS x,
v.column2 column2
FROM ( VALUES (1,2)) v; FROM ( VALUES (1,2)) v;
drop view rule_v1; drop view rule_v1;
@ -3157,8 +3157,8 @@ create view rule_v1(x) as select * from (values(1,2)) v(q,w);
x | integer | | | | plain | x | integer | | | | plain |
w | integer | | | | plain | w | integer | | | | plain |
View definition: View definition:
SELECT v.q AS x, SELECT q AS x,
v.w w
FROM ( VALUES (1,2)) v(q, w); FROM ( VALUES (1,2)) v(q, w);
drop view rule_v1; drop view rule_v1;

4
src/test/regress/expected/tablesample.out
View File

@ -74,7 +74,7 @@ CREATE VIEW test_tablesample_v2 AS
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
id | integer | | | | plain | id | integer | | | | plain |
View definition: View definition:
SELECT test_tablesample.id SELECT id
FROM test_tablesample TABLESAMPLE system ((10 * 2)) REPEATABLE (2); FROM test_tablesample TABLESAMPLE system ((10 * 2)) REPEATABLE (2);
\d+ test_tablesample_v2 \d+ test_tablesample_v2
@ -83,7 +83,7 @@ View definition:
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
id | integer | | | | plain | id | integer | | | | plain |
View definition: View definition:
SELECT test_tablesample.id SELECT id
FROM test_tablesample TABLESAMPLE system (99); FROM test_tablesample TABLESAMPLE system (99);
-- check a sampled query doesn't affect cursor in progress -- check a sampled query doesn't affect cursor in progress

4
src/test/regress/expected/triggers.out
View File

@ -1277,8 +1277,8 @@ DROP TRIGGER instead_of_delete_trig ON main_view;
a | integer | | | | plain | a | integer | | | | plain |
b | integer | | | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT main_table.a, SELECT a,
main_table.b b
FROM main_table; FROM main_table;
Triggers: Triggers:
after_del_stmt_trig AFTER DELETE ON main_view FOR EACH STATEMENT EXECUTE FUNCTION view_trigger('after_view_del_stmt') after_del_stmt_trig AFTER DELETE ON main_view FOR EACH STATEMENT EXECUTE FUNCTION view_trigger('after_view_del_stmt')

78
src/test/regress/expected/updatable_views.out
View File

@ -1925,19 +1925,19 @@ CREATE VIEW rw_view1 AS SELECT * FROM base_tbl WHERE a < b
a | integer | | | | plain | a | integer | | | | plain |
b | integer | | | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT base_tbl.a, SELECT a,
base_tbl.b b
FROM base_tbl FROM base_tbl
WHERE base_tbl.a < base_tbl.b; WHERE a < b;
Options: check_option=local Options: check_option=local
SELECT * FROM information_schema.views WHERE table_name = 'rw_view1'; SELECT * FROM information_schema.views WHERE table_name = 'rw_view1';
table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into
---------------+--------------+------------+------------------------------------+--------------+--------------+--------------------+----------------------+----------------------+---------------------------- ---------------+--------------+------------+------------------+--------------+--------------+--------------------+----------------------+----------------------+----------------------------
regression | public | rw_view1 | SELECT base_tbl.a, +| LOCAL | YES | YES | NO | NO | NO regression | public | rw_view1 | SELECT a, +| LOCAL | YES | YES | NO | NO | NO
| | | base_tbl.b +| | | | | | | | | b +| | | | | |
| | | FROM base_tbl +| | | | | | | | | FROM base_tbl+| | | | | |
| | | WHERE (base_tbl.a < base_tbl.b); | | | | | | | | | WHERE (a < b); | | | | | |
(1 row) (1 row)
INSERT INTO rw_view1 VALUES(3,4); -- ok INSERT INTO rw_view1 VALUES(3,4); -- ok
@ -1978,17 +1978,17 @@ CREATE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a < 10
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT a
FROM rw_view1 FROM rw_view1
WHERE rw_view1.a < 10; WHERE a < 10;
Options: check_option=cascaded Options: check_option=cascaded
SELECT * FROM information_schema.views WHERE table_name = 'rw_view2'; SELECT * FROM information_schema.views WHERE table_name = 'rw_view2';
table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into
---------------+--------------+------------+----------------------------+--------------+--------------+--------------------+----------------------+----------------------+---------------------------- ---------------+--------------+------------+-------------------+--------------+--------------+--------------------+----------------------+----------------------+----------------------------
regression | public | rw_view2 | SELECT rw_view1.a +| CASCADED | YES | YES | NO | NO | NO regression | public | rw_view2 | SELECT a +| CASCADED | YES | YES | NO | NO | NO
| | | FROM rw_view1 +| | | | | | | | | FROM rw_view1 +| | | | | |
| | | WHERE (rw_view1.a < 10); | | | | | | | | | WHERE (a < 10); | | | | | |
(1 row) (1 row)
INSERT INTO rw_view2 VALUES (-5); -- should fail INSERT INTO rw_view2 VALUES (-5); -- should fail
@ -2018,17 +2018,17 @@ CREATE OR REPLACE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a < 10
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT a
FROM rw_view1 FROM rw_view1
WHERE rw_view1.a < 10; WHERE a < 10;
Options: check_option=local Options: check_option=local
SELECT * FROM information_schema.views WHERE table_name = 'rw_view2'; SELECT * FROM information_schema.views WHERE table_name = 'rw_view2';
table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into
---------------+--------------+------------+----------------------------+--------------+--------------+--------------------+----------------------+----------------------+---------------------------- ---------------+--------------+------------+-------------------+--------------+--------------+--------------------+----------------------+----------------------+----------------------------
regression | public | rw_view2 | SELECT rw_view1.a +| LOCAL | YES | YES | NO | NO | NO regression | public | rw_view2 | SELECT a +| LOCAL | YES | YES | NO | NO | NO
| | | FROM rw_view1 +| | | | | | | | | FROM rw_view1 +| | | | | |
| | | WHERE (rw_view1.a < 10); | | | | | | | | | WHERE (a < 10); | | | | | |
(1 row) (1 row)
INSERT INTO rw_view2 VALUES (-10); -- ok, but not in view INSERT INTO rw_view2 VALUES (-10); -- ok, but not in view
@ -2059,16 +2059,16 @@ ALTER VIEW rw_view2 RESET (check_option);
--------+---------+-----------+----------+---------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT a
FROM rw_view1 FROM rw_view1
WHERE rw_view1.a < 10; WHERE a < 10;
SELECT * FROM information_schema.views WHERE table_name = 'rw_view2'; SELECT * FROM information_schema.views WHERE table_name = 'rw_view2';
table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into
---------------+--------------+------------+----------------------------+--------------+--------------+--------------------+----------------------+----------------------+---------------------------- ---------------+--------------+------------+-------------------+--------------+--------------+--------------------+----------------------+----------------------+----------------------------
regression | public | rw_view2 | SELECT rw_view1.a +| NONE | YES | YES | NO | NO | NO regression | public | rw_view2 | SELECT a +| NONE | YES | YES | NO | NO | NO
| | | FROM rw_view1 +| | | | | | | | | FROM rw_view1 +| | | | | |
| | | WHERE (rw_view1.a < 10); | | | | | | | | | WHERE (a < 10); | | | | | |
(1 row) (1 row)
INSERT INTO rw_view2 VALUES (30); -- ok, but not in view INSERT INTO rw_view2 VALUES (30); -- ok, but not in view
@ -2090,15 +2090,15 @@ CREATE VIEW rw_view1 AS SELECT * FROM base_tbl WITH CHECK OPTION;
CREATE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a > 0; CREATE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a > 0;
CREATE VIEW rw_view3 AS SELECT * FROM rw_view2 WITH CHECK OPTION; CREATE VIEW rw_view3 AS SELECT * FROM rw_view2 WITH CHECK OPTION;
SELECT * FROM information_schema.views WHERE table_name LIKE E'rw\\_view_' ORDER BY table_name; SELECT * FROM information_schema.views WHERE table_name LIKE E'rw\\_view_' ORDER BY table_name;
table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into table_catalog | table_schema | table_name | view_definition | check_option | is_updatable | is_insertable_into | is_trigger_updatable | is_trigger_deletable | is_trigger_insertable_into
---------------+--------------+------------+---------------------------+--------------+--------------+--------------------+----------------------+----------------------+---------------------------- ---------------+--------------+------------+-------------------+--------------+--------------+--------------------+----------------------+----------------------+----------------------------
regression | public | rw_view1 | SELECT base_tbl.a +| CASCADED | YES | YES | NO | NO | NO regression | public | rw_view1 | SELECT a +| CASCADED | YES | YES | NO | NO | NO
| | | FROM base_tbl; | | | | | | | | | FROM base_tbl; | | | | | |
regression | public | rw_view2 | SELECT rw_view1.a +| NONE | YES | YES | NO | NO | NO regression | public | rw_view2 | SELECT a +| NONE | YES | YES | NO | NO | NO
| | | FROM rw_view1 +| | | | | | | | | FROM rw_view1 +| | | | | |
| | | WHERE (rw_view1.a > 0); | | | | | | | | | WHERE (a > 0); | | | | | |
regression | public | rw_view3 | SELECT rw_view2.a +| CASCADED | YES | YES | NO | NO | NO regression | public | rw_view3 | SELECT a +| CASCADED | YES | YES | NO | NO | NO
| | | FROM rw_view2; | | | | | | | | | FROM rw_view2; | | | | | |
(3 rows) (3 rows)
INSERT INTO rw_view1 VALUES (-1); -- ok INSERT INTO rw_view1 VALUES (-1); -- ok

56
src/test/regress/expected/window.out
View File

@ -1212,10 +1212,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+ sum(i) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1238,10 +1238,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
----------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE CURRENT ROW) AS sum_rows+ sum(i) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE CURRENT ROW) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1264,10 +1264,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
----------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE GROUP) AS sum_rows+ sum(i) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE GROUP) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1290,10 +1290,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
---------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE TIES) AS sum_rows+ sum(i) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE TIES) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1316,10 +1316,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+ sum(i) OVER (ORDER BY i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1341,10 +1341,10 @@ SELECT * FROM v_window;
(10 rows) (10 rows)
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
----------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
sum(i.i) OVER (ORDER BY i.i GROUPS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+ sum(i) OVER (ORDER BY i GROUPS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+
FROM generate_series(1, 10) i(i); FROM generate_series(1, 10) i(i);
(1 row) (1 row)
@ -1353,10 +1353,10 @@ CREATE TEMP VIEW v_window AS
SELECT i, min(i) over (order by i range between '1 day' preceding and '10 days' following) as min_i SELECT i, min(i) over (order by i range between '1 day' preceding and '10 days' following) as min_i
FROM generate_series(now(), now()+'100 days'::interval, '1 hour') i; FROM generate_series(now(), now()+'100 days'::interval, '1 hour') i;
SELECT pg_get_viewdef('v_window'); SELECT pg_get_viewdef('v_window');
pg_get_viewdef pg_get_viewdef
--------------------------------------------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------------------------------------
SELECT i.i, + SELECT i, +
min(i.i) OVER (ORDER BY i.i RANGE BETWEEN '@ 1 day'::interval PRECEDING AND '@ 10 days'::interval FOLLOWING) AS min_i+ min(i) OVER (ORDER BY i RANGE BETWEEN '@ 1 day'::interval PRECEDING AND '@ 10 days'::interval FOLLOWING) AS min_i+
FROM generate_series(now(), (now() + '@ 100 days'::interval), '@ 1 hour'::interval) i(i); FROM generate_series(now(), (now() + '@ 100 days'::interval), '@ 1 hour'::interval) i(i);
(1 row) (1 row)

32
src/test/regress/expected/with.out
View File

@ -396,9 +396,9 @@ SELECT pg_get_viewdef('vsubdepartment'::regclass);
subdepartment sd + subdepartment sd +
WHERE (d.parent_department = sd.id)+ WHERE (d.parent_department = sd.id)+
) + ) +
SELECT subdepartment.id, + SELECT id, +
subdepartment.parent_department, + parent_department, +
subdepartment.name + name +
FROM subdepartment; FROM subdepartment;
(1 row) (1 row)
@ -419,9 +419,9 @@ SELECT pg_get_viewdef('vsubdepartment'::regclass, true);
subdepartment sd + subdepartment sd +
WHERE d.parent_department = sd.id+ WHERE d.parent_department = sd.id+
) + ) +
SELECT subdepartment.id, + SELECT id, +
subdepartment.parent_department, + parent_department, +
subdepartment.name + name +
FROM subdepartment; FROM subdepartment;
(1 row) (1 row)
@ -446,7 +446,7 @@ View definition:
FROM t t_1 FROM t t_1
WHERE t_1.n < 100 WHERE t_1.n < 100
) )
SELECT sum(t.n) AS sum SELECT sum(n) AS sum
FROM t; FROM t;
-- corner case in which sub-WITH gets initialized first -- corner case in which sub-WITH gets initialized first
@ -959,9 +959,9 @@ select pg_get_viewdef('v_search');
search_graph sg + search_graph sg +
WHERE (g.f = sg.t) + WHERE (g.f = sg.t) +
) SEARCH DEPTH FIRST BY f, t SET seq + ) SEARCH DEPTH FIRST BY f, t SET seq +
SELECT search_graph.f, + SELECT f, +
search_graph.t, + t, +
search_graph.label + label +
FROM search_graph; FROM search_graph;
(1 row) (1 row)
@ -1547,9 +1547,9 @@ select pg_get_viewdef('v_cycle1');
search_graph sg + search_graph sg +
WHERE (g.f = sg.t) + WHERE (g.f = sg.t) +
) CYCLE f, t SET is_cycle USING path + ) CYCLE f, t SET is_cycle USING path +
SELECT search_graph.f, + SELECT f, +
search_graph.t, + t, +
search_graph.label + label +
FROM search_graph; FROM search_graph;
(1 row) (1 row)
@ -1569,9 +1569,9 @@ select pg_get_viewdef('v_cycle2');
search_graph sg + search_graph sg +
WHERE (g.f = sg.t) + WHERE (g.f = sg.t) +
) CYCLE f, t SET is_cycle TO 'Y'::text DEFAULT 'N'::text USING path+ ) CYCLE f, t SET is_cycle TO 'Y'::text DEFAULT 'N'::text USING path+
SELECT search_graph.f, + SELECT f, +
search_graph.t, + t, +
search_graph.label + label +
FROM search_graph; FROM search_graph;
(1 row) (1 row)

6
src/test/regress/expected/xml.out
View File

@ -634,12 +634,12 @@ CREATE VIEW xmlview8 AS SELECT xmlserialize(content 'good' as char(10));
CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text); CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text);
SELECT table_name, view_definition FROM information_schema.views SELECT table_name, view_definition FROM information_schema.views
WHERE table_name LIKE 'xmlview%' ORDER BY 1; WHERE table_name LIKE 'xmlview%' ORDER BY 1;
table_name | view_definition table_name | view_definition
------------+------------------------------------------------------------------------------------------------------------------- ------------+------------------------------------------------------------------------------------------------------------
xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment; xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;
xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat"; xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement"; xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";
xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement"+ xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +
| FROM emp; | FROM emp;
xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse"; xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";
xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi"; xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";

6
src/test/regress/expected/xml_2.out
View File

@ -614,12 +614,12 @@ CREATE VIEW xmlview8 AS SELECT xmlserialize(content 'good' as char(10));
CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text); CREATE VIEW xmlview9 AS SELECT xmlserialize(content 'good' as text);
SELECT table_name, view_definition FROM information_schema.views SELECT table_name, view_definition FROM information_schema.views
WHERE table_name LIKE 'xmlview%' ORDER BY 1; WHERE table_name LIKE 'xmlview%' ORDER BY 1;
table_name | view_definition table_name | view_definition
------------+------------------------------------------------------------------------------------------------------------------- ------------+------------------------------------------------------------------------------------------------------------
xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment; xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;
xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat"; xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement"; xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";
xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(emp.name AS name, emp.age AS age, emp.salary AS pay)) AS "xmlelement"+ xmlview4 | SELECT XMLELEMENT(NAME employee, XMLFOREST(name AS name, age AS age, salary AS pay)) AS "xmlelement" +
| FROM emp; | FROM emp;
xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse"; xmlview5 | SELECT XMLPARSE(CONTENT '<abc>x</abc>'::text STRIP WHITESPACE) AS "xmlparse";
xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi"; xmlview6 | SELECT XMLPI(NAME foo, 'bar'::text) AS "xmlpi";