Skip to content

Fix aliasing table arguments of table functions #13649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasiafi merged 1 commit into from
Aug 29, 2022
Merged

Fix aliasing table arguments of table functions #13649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/trino-parser/src/main/java/io/trino/sql/parser/AstBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1891,7 +1891,7 @@ public Node visitTableArgumentTable(SqlBaseParser.TableArgumentTableContext cont

if (context.identifier() != null) {
Identifier alias = (Identifier) visit(context.identifier());
List<Identifier> columnNames = ImmutableList.of();
List<Identifier> columnNames = null;
if (context.columnAliases() != null) {
columnNames = visit(context.columnAliases().identifier(), Identifier.class);
}
Expand All @@ -1908,7 +1908,7 @@ public Node visitTableArgumentQuery(SqlBaseParser.TableArgumentQueryContext cont

if (context.identifier() != null) {
Identifier alias = (Identifier) visit(context.identifier());
List<Identifier> columnNames = ImmutableList.of();
List<Identifier> columnNames = null;
if (context.columnAliases() != null) {
columnNames = visit(context.columnAliases().identifier(), Identifier.class);
}
Expand Down
63 changes: 63 additions & 0 deletions core/trino-parser/src/test/java/io/trino/sql/parser/TestSqlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3965,6 +3965,69 @@ public void testTableFunctionInvocation()
qualifiedName(location(1, 739), "nation"))))));
}

@Test
public void testTableFunctionTableArgumentAliasing()
{
// no alias
assertThat(statement("SELECT * FROM TABLE(some_ptf(input => TABLE(orders)))"))
.isEqualTo(selectAllFrom(new TableFunctionInvocation(
location(1, 21),
qualifiedName(location(1, 21), "some_ptf"),
ImmutableList.of(new TableFunctionArgument(
location(1, 30),
Optional.of(new Identifier(location(1, 30), "input", false)),
new TableArgument(
location(1, 39),
new Table(location(1, 39), qualifiedName(location(1, 45), "orders")),
Optional.empty(),
Optional.empty(),
false))),
ImmutableList.of())));

// table alias; no column aliases
assertThat(statement("SELECT * FROM TABLE(some_ptf(input => TABLE(orders) AS ord))"))
.isEqualTo(selectAllFrom(new TableFunctionInvocation(
location(1, 21),
qualifiedName(location(1, 21), "some_ptf"),
ImmutableList.of(new TableFunctionArgument(
location(1, 30),
Optional.of(new Identifier(location(1, 30), "input", false)),
new TableArgument(
location(1, 39),
new AliasedRelation(
location(1, 39),
new Table(location(1, 39), qualifiedName(location(1, 45), "orders")),
new Identifier(location(1, 56), "ord", false),
null),
Optional.empty(),
Optional.empty(),
false))),
ImmutableList.of())));

// table alias and column aliases
assertThat(statement("SELECT * FROM TABLE(some_ptf(input => TABLE(orders) AS ord(a, b, c)))"))
.isEqualTo(selectAllFrom(new TableFunctionInvocation(
location(1, 21),
qualifiedName(location(1, 21), "some_ptf"),
ImmutableList.of(new TableFunctionArgument(
location(1, 30),
Optional.of(new Identifier(location(1, 30), "input", false)),
new TableArgument(
location(1, 39),
new AliasedRelation(
location(1, 39),
new Table(location(1, 39), qualifiedName(location(1, 45), "orders")),
new Identifier(location(1, 56), "ord", false),
ImmutableList.of(
new Identifier(location(1, 60), "a", false),
new Identifier(location(1, 63), "b", false),
new Identifier(location(1, 66), "c", false))),
Optional.empty(),
Optional.empty(),
false))),
ImmutableList.of())));
}

private static Query selectAllFrom(Relation relation)
{
return new Query(
Expand Down