Skip to content

Annotate PlanBuilder.expression argument as SQL #13570

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
findepi merged 2 commits into from
Aug 10, 2022
Merged

Annotate PlanBuilder.expression argument as SQL #13570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95046d8
Annotate PlanBuilder.expression argument as SQL
findepi Aug 9, 2022
56422a2
empty
findepi Aug 9, 2022
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
2 changes: 1 addition & 1 deletion core/trino-main/src/test/java/io/trino/sql/planner/assertions/PlanMatchPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ public static SymbolAlias symbol(String alias)
return new SymbolAlias(alias);
}

public static PlanMatchPattern filter(String expectedPredicate, PlanMatchPattern source)
public static PlanMatchPattern filter(@Language("SQL") String expectedPredicate, PlanMatchPattern source)
{
return filter(PlanBuilder.expression(expectedPredicate), source);
}
Expand Down
5 changes: 3 additions & 2 deletions core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/test/PlanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
import io.trino.testing.TestingMetadata.TestingTableHandle;
import io.trino.testing.TestingTableExecuteHandle;
import io.trino.testing.TestingTransactionHandle;
import org.intellij.lang.annotations.Language;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -1415,12 +1416,12 @@ public RemoteSourceNode remoteSource(
return new RemoteSourceNode(idAllocator.getNextId(), sourceFragmentIds, outputs, orderingScheme, exchangeType, retryPolicy);
}

public static Expression expression(String sql)
public static Expression expression(@Language("SQL") String sql)
{
return ExpressionUtils.rewriteIdentifiersToSymbolReferences(new SqlParser().createExpression(sql, new ParsingOptions()));
}

public static List<Expression> expressions(String... expressions)
public static List<Expression> expressions(@Language("SQL") String... expressions)
{
return Stream.of(expressions)
.map(PlanBuilder::expression)
Expand Down