diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/parse_target.c | 42 | ||||
| -rw-r--r-- | src/test/regress/expected/aggregates.out | 6 | ||||
| -rw-r--r-- | src/test/regress/expected/subselect.out | 12 | ||||
| -rw-r--r-- | src/test/regress/expected/with.out | 4 |
4 files changed, 53 insertions, 11 deletions
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c index 9d4e580e476..2f2e87fd698 100644 --- a/src/backend/parser/parse_target.c +++ b/src/backend/parser/parse_target.c @@ -1610,6 +1610,48 @@ FigureColnameInternal(Node *node, char **name) break; case T_CollateClause: return FigureColnameInternal(((CollateClause *) node)->arg, name); + case T_SubLink: + switch (((SubLink *) node)->subLinkType) + { + case EXISTS_SUBLINK: + *name = "exists"; + return 2; + case ARRAY_SUBLINK: + *name = "array"; + return 2; + case EXPR_SUBLINK: + { + /* Get column name of the subquery's single target */ + SubLink *sublink = (SubLink *) node; + Query *query = (Query *) sublink->subselect; + + /* + * The subquery has probably already been transformed, + * but let's be careful and check that. (The reason + * we can see a transformed subquery here is that + * transformSubLink is lazy and modifies the SubLink + * node in-place.) + */ + if (IsA(query, Query)) + { + TargetEntry *te = (TargetEntry *) linitial(query->targetList); + + if (te->resname) + { + *name = te->resname; + return 2; + } + } + } + break; + /* As with other operator-like nodes, these have no names */ + case ALL_SUBLINK: + case ANY_SUBLINK: + case ROWCOMPARE_SUBLINK: + case CTE_SUBLINK: + break; + } + break; case T_CaseExpr: strength = FigureColnameInternal((Node *) ((CaseExpr *) node)->defresult, name); diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out index 48610066bbd..69926f7b79e 100644 --- a/src/test/regress/expected/aggregates.out +++ b/src/test/regress/expected/aggregates.out @@ -300,9 +300,9 @@ LINE 4: where sum(distinct a.four + b.four) = b.four)... select (select max((select i.unique2 from tenk1 i where i.unique1 = o.unique1))) from tenk1 o; - ?column? ----------- - 9999 + max +------ + 9999 (1 row) -- diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index e638f0a60c3..4ea8211c692 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -490,20 +490,20 @@ select view_a from view_a; (1 row) select (select view_a) from view_a; - ?column? ----------- + view_a +-------- (42) (1 row) select (select (select view_a)) from view_a; - ?column? ----------- + view_a +-------- (42) (1 row) select (select (a.*)::text) from view_a a; - ?column? ----------- + a +------ (42) (1 row) diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out index a1b089921d3..c4b045604b6 100644 --- a/src/test/regress/expected/with.out +++ b/src/test/regress/expected/with.out @@ -1065,7 +1065,7 @@ with cte(foo) as ( select 42 ) select * from ((select foo from cte)) q; select ( with cte(foo) as ( values(f1) ) select (select foo from cte) ) from int4_tbl; - ?column? + foo ------------- 0 123456 @@ -1077,7 +1077,7 @@ from int4_tbl; select ( with cte(foo) as ( values(f1) ) values((select foo from cte)) ) from int4_tbl; - ?column? + column1 ------------- 0 123456 |