Skip to content

Support more types of parameters to JSON path #12682

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
Jun 8, 2022
Merged

Support more types of parameters to JSON path #12682

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
14 changes: 7 additions & 7 deletions core/trino-main/src/main/java/io/trino/sql/analyzer/ExpressionAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2791,17 +2791,17 @@ private List<Type> analyzeJsonPathInvocation(String functionName, Expression nod
else if (isNumericType(parameterType) || parameterType.equals(BOOLEAN)) {
passedType = parameterType;
}
else if (isDateTimeType(parameterType)) {
if (parameterType.equals(INTERVAL_DAY_TIME) || parameterType.equals(INTERVAL_YEAR_MONTH)) {
throw semanticException(INVALID_FUNCTION_ARGUMENT, parameter, "Invalid type of JSON path parameter: %s", parameterType.getDisplayName());
}
else if (isDateTimeType(parameterType) && !parameterType.equals(INTERVAL_DAY_TIME) && !parameterType.equals(INTERVAL_YEAR_MONTH)) {
passedType = parameterType;
}
else {
if (!typeCoercion.canCoerce(parameterType, VARCHAR)) {
throw semanticException(INVALID_FUNCTION_ARGUMENT, parameter, "Invalid type of JSON path parameter: %s", parameterType.getDisplayName());
try {
plannerContext.getMetadata().getCoercion(session, parameterType, VARCHAR);
}
catch (OperatorNotFoundException e) {
throw semanticException(NOT_SUPPORTED, node, "Unsupported type of JSON path parameter: %s", parameterType.getDisplayName());
}
coerceType(parameter, parameterType, VARCHAR, "JSON path parameter");
addOrReplaceExpressionCoercion(parameter, parameterType, VARCHAR);
passedType = VARCHAR;
}
}
Expand Down
14 changes: 10 additions & 4 deletions core/trino-main/src/test/java/io/trino/sql/analyzer/TestAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5417,12 +5417,18 @@ public void testJsonPathParameterFormats()
@Test
public void testJsonPathParameterTypes()
{
assertFails("SELECT JSON_EXISTS( " +
analyze("SELECT JSON_EXISTS( " +
" json_column, " +
" 'lax $.abs()' PASSING INTERVAL '2' DAY AS parameter_1) " +
" FROM (VALUES '-1', 'ala') t(json_column)")
.hasErrorCode(INVALID_FUNCTION_ARGUMENT)
.hasMessage("line 1:110: Invalid type of JSON path parameter: interval day to second");
" FROM (VALUES '-1', 'ala') t(json_column)");

analyze("SELECT JSON_EXISTS('[]', 'lax $[2]' PASSING INTERVAL '2' DAY AS parameter_interval)");

analyze("SELECT JSON_EXISTS('[]', 'lax $[2]' PASSING UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59' AS parameter_uuid)");

assertFails("SELECT JSON_EXISTS('[]', 'lax $[2]' PASSING approx_set(1) AS parameter_hll)")
.hasErrorCode(NOT_SUPPORTED)
.hasMessage("line 1:8: Unsupported type of JSON path parameter: HyperLogLog");
}

@Test
Expand Down
9 changes: 9 additions & 0 deletions core/trino-main/src/test/java/io/trino/sql/query/TestJsonQueryFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,15 @@ public void testPassingClause()
assertThat(assertions.query(
"SELECT json_query('" + INPUT + "', 'lax $parameter' PASSING DATE '2001-01-31' AS \"parameter\")"))
.matches("VALUES cast(null AS varchar)");

// parameter cast to varchar
assertThat(assertions.query(
"SELECT json_query('" + INPUT + "', 'lax $parameter' PASSING INTERVAL '2' DAY AS \"parameter\")"))
.matches("VALUES cast('\"2 00:00:00.000\"' AS varchar)");

assertThat(assertions.query(
"SELECT json_query('" + INPUT + "', 'lax $parameter' PASSING UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59' AS \"parameter\")"))
.matches("VALUES cast('\"12151fd2-7586-11e9-8f9e-2a86e4085a59\"' AS varchar)");
}

@Test
Expand Down
9 changes: 9 additions & 0 deletions core/trino-main/src/test/java/io/trino/sql/query/TestJsonValueFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,15 @@ public void testPassingClause()
assertThat(assertions.query(
"SELECT json_value('" + INPUT + "', 'lax $[$number]' PASSING 5 AS \"number\")"))
.matches("VALUES cast(null AS varchar)");

// parameter cast to varchar
assertThat(assertions.query(
"SELECT json_value('" + INPUT + "', 'lax $parameter' PASSING INTERVAL '2' DAY AS \"parameter\")"))
.matches("VALUES cast('2 00:00:00.000' AS varchar)");

assertThat(assertions.query(
"SELECT json_value('" + INPUT + "', 'lax $parameter' PASSING UUID '12151fd2-7586-11e9-8f9e-2a86e4085a59' AS \"parameter\")"))
.matches("VALUES cast('12151fd2-7586-11e9-8f9e-2a86e4085a59' AS varchar)");
}

@Test
Expand Down