Skip to content

Use proper SQL identifier semantics for named call arguments #11123

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

Closed
kasiafi wants to merge 1 commit into from
Closed

Use proper SQL identifier semantics for named call arguments #11123

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
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/execution/CallTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public ListenableFuture<Void> execute(
for (int i = 0; i < call.getArguments().size(); i++) {
CallArgument argument = call.getArguments().get(i);
if (argument.getName().isPresent()) {
String name = argument.getName().get();
String name = argument.getName().get().getCanonicalValue();
if (names.put(name, argument) != null) {
throw semanticException(INVALID_ARGUMENTS, argument, "Duplicate procedure argument: %s", name);
}
Expand Down
2 changes: 1 addition & 1 deletion core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ private Map<String, Expression> processTableExecuteArguments(TableExecute node,
if (anyNamed) {
// all properties named
for (CallArgument argument : arguments) {
if (argumentsMap.put(argument.getName().get(), argument.getValue()) != null) {
if (argumentsMap.put(argument.getName().get().getCanonicalValue(), argument.getValue()) != null) {
throw semanticException(DUPLICATE_PROPERTY, argument, "Duplicate named argument: %s", argument.getName());
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -2698,7 +2698,7 @@ public Node visitPositionalArgument(SqlBaseParser.PositionalArgumentContext cont
@Override
public Node visitNamedArgument(SqlBaseParser.NamedArgumentContext context)
{
return new CallArgument(getLocation(context), context.identifier().getText(), (Expression) visit(context.expression()));
return new CallArgument(getLocation(context), (Identifier) visit(context.identifier()), (Expression) visit(context.expression()));
}

@Override
Expand Down
10 changes: 5 additions & 5 deletions core/trino-parser/src/main/java/io/trino/sql/tree/CallArgument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
public final class CallArgument
extends Node
{
private final Optional<String> name;
private final Optional<Identifier> name;
private final Expression value;

public CallArgument(Expression value)
Expand All @@ -38,24 +38,24 @@ public CallArgument(NodeLocation location, Expression value)
this(Optional.of(location), Optional.empty(), value);
}

public CallArgument(String name, Expression value)
public CallArgument(Identifier name, Expression value)
{
this(Optional.empty(), Optional.of(name), value);
}

public CallArgument(NodeLocation location, String name, Expression value)
public CallArgument(NodeLocation location, Identifier name, Expression value)
{
this(Optional.of(location), Optional.of(name), value);
}

public CallArgument(Optional<NodeLocation> location, Optional<String> name, Expression value)
public CallArgument(Optional<NodeLocation> location, Optional<Identifier> name, Expression value)
{
super(location);
this.name = requireNonNull(name, "name is null");
this.value = requireNonNull(value, "value is null");
}

public Optional<String> getName()
public Optional<Identifier> getName()
{
return name;
}
Expand Down
8 changes: 4 additions & 4 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 @@ -1909,8 +1909,8 @@ public void testTableExecute()
table,
procedure,
ImmutableList.of(
new CallArgument("bah", new LongLiteral("1")),
new CallArgument("wuh", new StringLiteral("clap"))),
new CallArgument(identifier("bah"), new LongLiteral("1")),
new CallArgument(identifier("wuh"), new StringLiteral("clap"))),
Optional.of(
new ComparisonExpression(ComparisonExpression.Operator.GREATER_THAN,
new Identifier("age"),
Expand Down Expand Up @@ -2577,8 +2577,8 @@ public void testCall()
assertStatement("CALL foo()", new Call(QualifiedName.of("foo"), ImmutableList.of()));
assertStatement("CALL foo(123, a => 1, b => 'go', 456)", new Call(QualifiedName.of("foo"), ImmutableList.of(
new CallArgument(new LongLiteral("123")),
new CallArgument("a", new LongLiteral("1")),
new CallArgument("b", new StringLiteral("go")),
new CallArgument(identifier("a"), new LongLiteral("1")),
new CallArgument(identifier("b"), new StringLiteral("go")),
new CallArgument(new LongLiteral("456")))));
}

Expand Down
11 changes: 11 additions & 0 deletions testing/trino-testing/src/main/java/io/trino/testing/TestingProcedures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,12 @@ public void error()
throw new RuntimeException("test error from procedure");
}

@UsedByGeneratedCode
public void names(ConnectorSession session, String x, String y, String z, String v)
{
tester.recordCalled("names", x, y, z, v);
}

public List<Procedure> getProcedures(String schema)
{
return ImmutableList.<Procedure>builder()
Expand Down Expand Up @@ -164,6 +170,11 @@ public List<Procedure> getProcedures(String schema)
new Argument("v", VARCHAR, false, "v default"))))
.add(procedure(schema, "test_exception", "exception", ImmutableList.of()))
.add(procedure(schema, "test_error", "error", ImmutableList.of()))
.add(procedure(schema, "test_argument_names", "names", ImmutableList.of(
new Argument("lower", VARCHAR, false, "a"),
new Argument("UPPER", VARCHAR, false, "b"),
new Argument("MixeD", VARCHAR, false, "c"),
new Argument("with space", VARCHAR, false, "d"))))
.build();
}

Expand Down
61 changes: 38 additions & 23 deletions testing/trino-tests/src/test/java/io/trino/tests/TestProcedureCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ public void testProcedureCall()
assertCall("CALL test_args(123, 4.5, 'hello', true)", "args", 123L, 4.5, "hello", true);
assertCall("CALL test_args(-5, nan(), 'bye', false)", "args", -5L, Double.NaN, "bye", false);
assertCall("CALL test_args(3, 88, 'coerce', true)", "args", 3L, 88.0, "coerce", true);
assertCall("CALL test_args(x => 123, y => 4.5, z => 'hello', q => true)", "args", 123L, 4.5, "hello", true);
assertCall("CALL test_args(q => true, z => 'hello', y => 4.5, x => 123)", "args", 123L, 4.5, "hello", true);
assertCall("CALL test_args(\"x\" => 123, \"y\" => 4.5, \"z\" => 'hello', \"q\" => true)", "args", 123L, 4.5, "hello", true);
assertCall("CALL test_args(\"q\" => true, \"z\" => 'hello', \"y\" => 4.5, \"x\" => 123)", "args", 123L, 4.5, "hello", true);

assertCall("CALL test_nulls(123, null)", "nulls", 123L, null);
assertCall("CALL test_nulls(null, 'apple')", "nulls", null, "apple");
Expand All @@ -117,43 +117,58 @@ public void testProcedureCall()

assertCallFails("CALL test_simple(123)", "line 1:1: Too many arguments for procedure");
assertCallFails("CALL test_args(123, 4.5, 'hello')", "line 1:1: Required procedure argument 'q' is missing");
assertCallFails("CALL test_args(x => 123, y => 4.5, q => true)", "line 1:1: Required procedure argument 'z' is missing");
assertCallFails("CALL test_args(123, 4.5, 'hello', q => true)", "line 1:1: Named and positional arguments cannot be mixed");
assertCallFails("CALL test_args(x => 3, x => 4)", "line 1:24: Duplicate procedure argument: x");
assertCallFails("CALL test_args(t => 404)", "line 1:16: Unknown argument name: t");
assertCallFails("CALL test_args(\"x\" => 123, \"y\" => 4.5, \"q\" => true)", "line 1:1: Required procedure argument 'z' is missing");
assertCallFails("CALL test_args(123, 4.5, 'hello', \"q\" => true)", "line 1:1: Named and positional arguments cannot be mixed");
assertCallFails("CALL test_args(\"x\" => 3, \"x\" => 4)", "line 1:26: Duplicate procedure argument: x");
assertCallFails("CALL test_args(\"t\" => 404)", "line 1:16: Unknown argument name: t");
assertCallFails("CALL test_nulls('hello', null)", "line 1:17: Cannot cast type varchar(5) to bigint");
assertCallFails("CALL test_nulls(null, 123)", "line 1:23: Cannot cast type integer to varchar");
}

@Test
public void testProcedureCallWithOptionals()
{
// test_optionals(x => Optional['hello'])
// test_optionals2(x, y => Optional['world])
// test_optionals3(x => Optional['this'], y => Optional['is'], z => Optional['default'])
// test_optionals4(x, y, z => Optional['z default'], v => Optional['v default'])
// test_optionals(\"x\" => Optional['hello'])
// test_optionals2(x, \"y\" => Optional['world])
// test_optionals3(\"x\" => Optional['this'], \"y\" => Optional['is'], \"z\" => Optional['default'])
// test_optionals4(x, y, \"z\" => Optional['z default'], \"v\" => Optional['v default'])
assertCall("CALL test_optionals()", "optionals", "hello");
assertCall("CALL test_optionals(x => 'x')", "optionals", "x");
assertCall("CALL test_optionals2(x => 'ab')", "optionals2", "ab", "world");
assertCall("CALL test_optionals(\"x\" => 'x')", "optionals", "x");
assertCall("CALL test_optionals2(\"x\" => 'ab')", "optionals2", "ab", "world");
assertCall("CALL test_optionals2('ab')", "optionals2", "ab", "world");
assertCall("CALL test_optionals2(x => 'ab', y => 'cd')", "optionals2", "ab", "cd");
assertCall("CALL test_optionals2(y => 'cd', x => 'ab')", "optionals2", "ab", "cd");
assertCall("CALL test_optionals2(\"x\" => 'ab', \"y\" => 'cd')", "optionals2", "ab", "cd");
assertCall("CALL test_optionals2(\"y\" => 'cd', \"x\" => 'ab')", "optionals2", "ab", "cd");
assertCall("CALL test_optionals2('ab', 'cd')", "optionals2", "ab", "cd");
assertCall("CALL test_optionals3(x => 'ab', z => 'cd')", "optionals3", "ab", "is", "cd");
assertCall("CALL test_optionals3(\"x\" => 'ab', \"z\" => 'cd')", "optionals3", "ab", "is", "cd");
assertCall("CALL test_optionals3('ab', 'cd', 'ef')", "optionals3", "ab", "cd", "ef");
assertCall("CALL test_optionals3('ab', 'cd')", "optionals3", "ab", "cd", "default");
assertCall("CALL test_optionals3('ab')", "optionals3", "ab", "is", "default");
assertCall("CALL test_optionals3(y => 'ab', z => 'cd')", "optionals3", "this", "ab", "cd");
assertCall("CALL test_optionals3(z => 'cd')", "optionals3", "this", "is", "cd");
assertCall("CALL test_optionals3(\"y\" => 'ab', \"z\" => 'cd')", "optionals3", "this", "ab", "cd");
assertCall("CALL test_optionals3(\"z\" => 'cd')", "optionals3", "this", "is", "cd");
assertCall("CALL test_optionals4('a', 'b')", "optionals4", "a", "b", "z default", "v default");
assertCall("CALL test_optionals4(x => 'x val', y => 'y val')", "optionals4", "x val", "y val", "z default", "v default");
assertCall("CALL test_optionals4(z => 'z val', v => 'v val', x => 'x val', y => 'y val')", "optionals4", "x val", "y val", "z val", "v val");
assertCall("CALL test_optionals4(v => 'v val', x => 'x val', y => 'y val', z => 'z val')", "optionals4", "x val", "y val", "z val", "v val");
assertCall("CALL test_optionals4(\"x\" => 'x val', \"y\" => 'y val')", "optionals4", "x val", "y val", "z default", "v default");
assertCall("CALL test_optionals4(\"z\" => 'z val', \"v\" => 'v val', \"x\" => 'x val', \"y\" => 'y val')", "optionals4", "x val", "y val", "z val", "v val");
assertCall("CALL test_optionals4(\"v\" => 'v val', \"x\" => 'x val', \"y\" => 'y val', \"z\" => 'z val')", "optionals4", "x val", "y val", "z val", "v val");

assertCallFails("CALL test_optionals2()", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(z => 'cd')", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(z => 'cd', v => 'value')", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(y => 'cd', v => 'value')", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(\"z\" => 'cd')", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(\"z\" => 'cd', \"v\" => 'value')", "line 1:1: Required procedure argument 'x' is missing");
assertCallFails("CALL test_optionals4(\"y\" => 'cd', \"v\" => 'value')", "line 1:1: Required procedure argument 'x' is missing");
}

@Test
public void testNamedArguments()
{
assertCallFails("CALL test_argument_names(lower => 'a')", "line 1:26: Unknown argument name: LOWER");
assertCallFails("CALL test_argument_names(LOWER => 'a')", "line 1:26: Unknown argument name: LOWER");
assertCall("CALL test_argument_names(\"lower\" => 'a')", "names", "a", "b", "c", "d");
assertCall("CALL test_argument_names(upper => 'b')", "names", "a", "b", "c", "d");
assertCall("CALL test_argument_names(UPPER => 'b')", "names", "a", "b", "c", "d");
assertCallFails("CALL test_argument_names(\"upper\" => 'b')", "line 1:26: Unknown argument name: upper");
assertCallFails("CALL test_argument_names(MixeD => 'c')", "line 1:26: Unknown argument name: MIXED");
assertCallFails("CALL test_argument_names(MIXED => 'c')", "line 1:26: Unknown argument name: MIXED");
assertCall("CALL test_argument_names(\"MixeD\" => 'c')", "names", "a", "b", "c", "d");
assertCall("CALL test_argument_names(\"with space\" => 'd')", "names", "a", "b", "c", "d");
}

private void assertCall(@Language("SQL") String sql, String name, Object... arguments)
Expand Down