Skip to content

Add native JSON type support for SQL Server 2025 #28101

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

Open
kirkhansen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add native JSON type support for SQL Server 2025 #28101

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
23 changes: 23 additions & 0 deletions plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@
import io.trino.spi.type.TimestampType;
import io.trino.spi.type.TimestampWithTimeZoneType;
import io.trino.spi.type.Type;
import io.trino.spi.type.TypeManager;
import io.trino.spi.type.TypeSignature;
import io.trino.spi.type.VarbinaryType;
import io.trino.spi.type.VarcharType;
import microsoft.sql.DateTimeOffset;
Expand Down Expand Up @@ -137,7 +139,9 @@
import static com.google.common.base.Throwables.throwIfInstanceOf;
import static com.google.common.collect.MoreCollectors.toOptional;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
import static io.airlift.slice.Slices.utf8Slice;
import static io.airlift.slice.Slices.wrappedBuffer;
import static io.trino.plugin.base.util.JsonTypeUtil.jsonParse;
import static io.trino.plugin.jdbc.CaseSensitivity.CASE_INSENSITIVE;
import static io.trino.plugin.jdbc.CaseSensitivity.CASE_SENSITIVE;
import static io.trino.plugin.jdbc.JdbcErrorCode.JDBC_ERROR;
Expand Down Expand Up @@ -191,6 +195,7 @@
import static io.trino.spi.type.IntegerType.INTEGER;
import static io.trino.spi.type.RealType.REAL;
import static io.trino.spi.type.SmallintType.SMALLINT;
import static io.trino.spi.type.StandardTypes.JSON;
import static io.trino.spi.type.TimeType.createTimeType;
import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
import static io.trino.spi.type.TimeZoneKey.getTimeZoneKey;
Expand Down Expand Up @@ -236,6 +241,7 @@ public class SqlServerClient

private final boolean statisticsEnabled;

private final Type jsonType;
private final ConnectorExpressionRewriter<ParameterizedExpression> connectorExpressionRewriter;
private final AggregateFunctionRewriter<JdbcExpression, ?> aggregateFunctionRewriter;

Expand Down Expand Up @@ -301,11 +307,13 @@ public SqlServerClient(
JdbcStatisticsConfig statisticsConfig,
ConnectionFactory connectionFactory,
QueryBuilder queryBuilder,
TypeManager typeManager,
IdentifierMapping identifierMapping,
RemoteQueryModifier queryModifier)
{
super("\"", connectionFactory, queryBuilder, config.getJdbcTypesMappedToVarchar(), identifierMapping, queryModifier, true);

this.jsonType = typeManager.getType(new TypeSignature(JSON));
this.statisticsEnabled = statisticsConfig.isEnabled();

this.connectorExpressionRewriter = JdbcConnectorExpressionRewriterBuilder.newBuilder()
Expand Down Expand Up @@ -601,6 +609,8 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
return Optional.of(varbinaryColumnMapping());
case "datetimeoffset":
return Optional.of(timestampWithTimeZoneColumnMapping(typeHandle.requiredDecimalDigits()));
case "json":
return Optional.of(jsonColumnMapping());
Comment thread
kirkhansen marked this conversation as resolved.
}

switch (typeHandle.jdbcType()) {
Expand Down Expand Up @@ -681,6 +691,15 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
return Optional.empty();
}

private ColumnMapping jsonColumnMapping()
Comment thread
findepi marked this conversation as resolved.
Comment thread
kirkhansen marked this conversation as resolved.
{
return ColumnMapping.sliceMapping(
jsonType,
(resultSet, columnIndex) -> jsonParse(utf8Slice(resultSet.getString(columnIndex))),
nvarcharWriteFunction(),
DISABLE_PUSHDOWN);
}

@Override
public WriteMapping toWriteMapping(ConnectorSession session, Type type)
{
Expand Down Expand Up @@ -737,6 +756,10 @@ public WriteMapping toWriteMapping(ConnectorSession session, Type type)
return WriteMapping.sliceMapping(dataType, charWriteFunction());
}

if (type == jsonType) {
return WriteMapping.sliceMapping("json", nvarcharWriteFunction());
}

if (type instanceof VarbinaryType) {
return WriteMapping.sliceMapping("varbinary(max)", varbinaryWriteFunction());
}
Expand Down
25 changes: 25 additions & 0 deletions plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import static io.trino.spi.type.VarcharType.createVarcharType;
import static io.trino.sql.planner.assertions.PlanMatchPattern.tableScan;
import static io.trino.testing.TestingNames.randomNameSuffix;
import static io.trino.type.JsonType.JSON;
import static java.lang.String.format;
import static java.time.ZoneOffset.UTC;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -998,6 +999,30 @@ public void testSqlServerDatetimeOffsetHistoricalDatesRangeQuery()
}
}

@Test
Comment thread
kirkhansen marked this conversation as resolved.
public void testSqlServerJson()
{
// Conforms to RFC 4627, so not scalar values, but only objects and arrays.
SqlDataTypeTest.create()
.addRoundTrip("json", "JSON '{}'", JSON, "JSON '{}'")
.addRoundTrip("json", "NULL", JSON, "CAST(NULL AS JSON)")
.addRoundTrip("json", "JSON '{\"a\":1,\"b\":2}'", JSON, "JSON '{\"a\":1,\"b\":2}'")
.addRoundTrip("json", "JSON '{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}'", JSON, "JSON '{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}'")
.addRoundTrip("json", "JSON '[]'", JSON, "JSON '[]'")
.execute(getQueryRunner(), sqlServerCreateAndTrinoInsert("test_json"));

SqlDataTypeTest.create()
.addRoundTrip("json", "JSON '{}'", JSON, "JSON '{}'")
.addRoundTrip("json", "NULL", JSON, "CAST(NULL AS JSON)")
.addRoundTrip("json", "JSON '{\"a\":1,\"b\":2}'", JSON, "JSON '{\"a\":1,\"b\":2}'")
.addRoundTrip("json", "JSON '{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}'", JSON, "JSON '{\"a\":[1,2,3],\"b\":{\"aa\":11,\"bb\":[{\"a\":1,\"b\":2},{\"a\":0}]}}'")
.addRoundTrip("json", "JSON '[]'", JSON, "JSON '[]'")
.execute(getQueryRunner(), trinoCreateAsSelect("test_json"))
.execute(getQueryRunner(), trinoCreateAndInsert("test_json"));

}


protected DataSetup trinoCreateAsSelect(String tableNamePrefix)
{
return trinoCreateAsSelect(getSession(), tableNamePrefix);
Expand Down
2 changes: 2 additions & 0 deletions plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import static io.trino.spi.type.BooleanType.BOOLEAN;
import static io.trino.spi.type.DoubleType.DOUBLE;
import static io.trino.testing.TestingConnectorSession.SESSION;
import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
import static org.assertj.core.api.Assertions.assertThat;

public class TestSqlServerClient
Expand All @@ -63,6 +64,7 @@ public class TestSqlServerClient
throw new UnsupportedOperationException();
},
new DefaultQueryBuilder(RemoteQueryModifier.NONE),
TESTING_TYPE_MANAGER,
new DefaultIdentifierMapping(),
RemoteQueryModifier.NONE);

Expand Down
10 changes: 10 additions & 0 deletions plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/TestSqlServerTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
package io.trino.plugin.sqlserver;

import io.trino.testing.QueryRunner;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assumptions.abort;

public class TestSqlServerTypeMapping
extends BaseSqlServerTypeMapping
Expand All @@ -26,4 +29,11 @@ protected QueryRunner createQueryRunner()
return SqlServerQueryRunner.builder(sqlServer)
.build();
}

@Test
@Override
public void testSqlServerJson()
{
abort("json type is not supported in SQL Server 2019-CU28-ubuntu-20.04");
}
}