Fix incorrect result of sql server tinyint

docs/src/main/sphinx/connector/sqlserver.rst

@@ -125,6 +125,7 @@ Trino supports the following SQL Server data types:
 SQL Server Type                     Trino Type
 ==================================  ===============================
 ``bigint``                          ``bigint``
+``tinyint``                         ``smallint``
 ``smallint``                        ``smallint``
 ``int``                             ``integer``
 ``float``                           ``double``

plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java

@@ -106,7 +106,7 @@ public void setUp()
 
     private DataSetup trinoCreateAsSelect(String tableNamePrefix)
     {
-        return new CreateAsSelectDataSetup(new TrinoSqlExecutor(getQueryRunner()), tableNamePrefix);
+        return trinoCreateAsSelect(getSession(), tableNamePrefix);
     }
 
     private DataSetup trinoCreateAsSelect(Session session, String tableNamePrefix)

plugin/trino-sqlserver/src/main/java/io/trino/plugin/sqlserver/SqlServerClient.java

@@ -124,7 +124,6 @@
 import static io.trino.plugin.jdbc.StandardColumnMappings.timeReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.timestampColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.timestampWriteFunction;
-import static io.trino.plugin.jdbc.StandardColumnMappings.tinyintColumnMapping;
 import static io.trino.plugin.jdbc.StandardColumnMappings.tinyintWriteFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varcharReadFunction;
 import static io.trino.plugin.jdbc.StandardColumnMappings.varcharWriteFunction;
@@ -285,7 +284,10 @@ public Optional<ColumnMapping> toColumnMapping(ConnectorSession session, Connect
                 return Optional.of(booleanColumnMapping());
 
             case Types.TINYINT:
-                return Optional.of(tinyintColumnMapping());
+                // Map SQL Server TINYINT to Trino SMALLINT because SQL Server TINYINT is actually "unsigned tinyint"
+                // We don't check the range of values, because SQL Server will do it for us, and this behavior has already
+                // been tested in `BaseSqlServerTypeMapping#testUnsupportedTinyint`
+                return Optional.of(smallintColumnMapping());
 
             case Types.SMALLINT:
                 return Optional.of(smallintColumnMapping());
@@ -782,14 +784,14 @@ private static SliceWriteFunction nvarcharWriteFunction()
     private static Optional<DataCompression> getTableDataCompression(Handle handle, JdbcTableHandle table)
     {
         return handle.createQuery("" +
-                "SELECT data_compression_desc FROM sys.partitions p " +
-                "INNER JOIN sys.tables t ON p.object_id = t.object_id " +
-                "INNER JOIN sys.schemas s ON t.schema_id = s.schema_id " +
-                "INNER JOIN sys.indexes i ON t.object_id = i.object_id " +
-                "WHERE s.name = :schema AND t.name = :table_name " +
-                "AND p.index_id = 0 " + // Heap
-                "AND i.type = 0 " + // Heap index type
-                "AND i.data_space_id NOT IN (SELECT data_space_id FROM sys.partition_schemes)")
+                        "SELECT data_compression_desc FROM sys.partitions p " +
+                        "INNER JOIN sys.tables t ON p.object_id = t.object_id " +
+                        "INNER JOIN sys.schemas s ON t.schema_id = s.schema_id " +
+                        "INNER JOIN sys.indexes i ON t.object_id = i.object_id " +
+                        "WHERE s.name = :schema AND t.name = :table_name " +
+                        "AND p.index_id = 0 " + // Heap
+                        "AND i.type = 0 " + // Heap index type
+                        "AND i.data_space_id NOT IN (SELECT data_space_id FROM sys.partition_schemes)")
                 .bind("schema", table.getSchemaName())
                 .bind("table_name", table.getTableName())
                 .mapTo(String.class)

plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTypeMapping.java

@@ -19,6 +19,7 @@
 import io.trino.testing.AbstractTestQueryFramework;
 import io.trino.testing.TestingSession;
 import io.trino.testing.datatype.CreateAndInsertDataSetup;
+import io.trino.testing.datatype.CreateAndTrinoInsertDataSetup;
 import io.trino.testing.datatype.CreateAsSelectDataSetup;
 import io.trino.testing.datatype.DataSetup;
 import io.trino.testing.datatype.SqlDataTypeTest;
@@ -49,7 +50,6 @@
 import static io.trino.spi.type.TimeZoneKey.UTC_KEY;
 import static io.trino.spi.type.TimestampType.createTimestampType;
 import static io.trino.spi.type.TimestampWithTimeZoneType.createTimestampWithTimeZoneType;
-import static io.trino.spi.type.TinyintType.TINYINT;
 import static io.trino.spi.type.VarbinaryType.VARBINARY;
 import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
 import static io.trino.spi.type.VarcharType.createVarcharType;
@@ -114,13 +114,27 @@ public void testSqlServerBit()
     @Test
     public void testTinyint()
     {
-        // TODO: Add min/max/min-1/max+1 tests (https://github.com/trinodb/trino/issues/11209)
+        // Map SQL Server TINYINT to Trino SMALLINT because SQL Server TINYINT is actually "unsigned tinyint"
         SqlDataTypeTest.create()
-                .addRoundTrip("tinyint", "NULL", TINYINT, "CAST(NULL AS TINYINT)")
-                .addRoundTrip("tinyint", "5", TINYINT, "TINYINT '5'")
+                .addRoundTrip("tinyint", "NULL", SMALLINT, "CAST(NULL AS SMALLINT)")
+                .addRoundTrip("tinyint", "0", SMALLINT, "SMALLINT '0'") // min value in SQL Server
+                .addRoundTrip("tinyint", "5", SMALLINT, "SMALLINT '5'")
+                .addRoundTrip("tinyint", "255", SMALLINT, "SMALLINT '255'") // max value in SQL Server
                 .execute(getQueryRunner(), sqlServerCreateAndInsert("test_tinyint"))
-                .execute(getQueryRunner(), trinoCreateAsSelect("test_tinyint"))
-                .execute(getQueryRunner(), trinoCreateAndInsert("test_tinyint"));
+                .execute(getQueryRunner(), sqlServerCreateAndTrinoInsert("test_tinyint"));
+    }
+
+    @Test
+    public void testUnsupportedTinyint()
+    {
+        try (TestTable table = new TestTable(onRemoteDatabase(), "test_unsupported_tinyint", "(data tinyint)")) {
+            assertSqlServerQueryFails(
+                    format("INSERT INTO %s VALUES (-1)", table.getName()), // min - 1
+                    "Arithmetic overflow error for data type tinyint, value = -1");
+            assertSqlServerQueryFails(
+                    format("INSERT INTO %s VALUES (256)", table.getName()), // max + 1
+                    "Arithmetic overflow error for data type tinyint, value = 256.");
+        }
     }
 
     @Test
@@ -833,7 +847,7 @@ protected DataSetup trinoCreateAsSelect(Session session, String tableNamePrefix)
 
     protected DataSetup trinoCreateAndInsert(String tableNamePrefix)
     {
-        return new CreateAndInsertDataSetup(new TrinoSqlExecutor(getQueryRunner(), getSession()), tableNamePrefix);
+        return trinoCreateAndInsert(getSession(), tableNamePrefix);
     }
 
     protected DataSetup trinoCreateAndInsert(Session session, String tableNamePrefix)
@@ -846,6 +860,16 @@ protected DataSetup sqlServerCreateAndInsert(String tableNamePrefix)
         return new CreateAndInsertDataSetup(onRemoteDatabase(), tableNamePrefix);
     }
 
+    protected DataSetup sqlServerCreateAndTrinoInsert(String tableNamePrefix)
+    {
+        return sqlServerCreateAndTrinoInsert(getSession(), tableNamePrefix);
+    }
+
+    protected DataSetup sqlServerCreateAndTrinoInsert(Session session, String tableNamePrefix)
+    {
+        return new CreateAndTrinoInsertDataSetup(onRemoteDatabase(), new TrinoSqlExecutor(getQueryRunner(), session), tableNamePrefix);
+    }
+
     private static void checkIsDoubled(ZoneId zone, LocalDateTime dateTime)
     {
         verify(zone.getRules().getValidOffsets(dateTime).size() == 2, "Expected %s to be doubled in %s", dateTime, zone);

testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/SqlServerDataTypesTableDefinition.java

@@ -68,7 +68,7 @@ private SqlServerDataTypesTableDefinition() {}
                         Long.MIN_VALUE,
                         Short.MIN_VALUE,
                         Integer.MIN_VALUE,
-                        Byte.MIN_VALUE,
+                        0,
                         Double.MIN_VALUE,
                         -3.40E+38f,
                         "\0",
@@ -88,7 +88,7 @@ private SqlServerDataTypesTableDefinition() {}
                         Long.MAX_VALUE,
                         Short.MAX_VALUE,
                         Integer.MAX_VALUE,
-                        Byte.MAX_VALUE,
+                        255,
                         Double.MAX_VALUE,
                         Float.MAX_VALUE,
                         "abcd",

testing/trino-product-tests/src/main/java/io/trino/tests/product/sqlserver/TestSelect.java

@@ -48,7 +48,6 @@
 import static java.sql.JDBCType.REAL;
 import static java.sql.JDBCType.SMALLINT;
 import static java.sql.JDBCType.TIMESTAMP;
-import static java.sql.JDBCType.TINYINT;
 import static java.sql.JDBCType.VARCHAR;
 import static java.util.Collections.nCopies;
 
@@ -133,7 +132,7 @@ public void testAllDatatypes()
                         BIGINT,
                         SMALLINT,
                         INTEGER,
-                        TINYINT,
+                        SMALLINT,
                         DOUBLE,
                         REAL,
                         CHAR,
@@ -154,7 +153,7 @@ public void testAllDatatypes()
                                 Long.MIN_VALUE,
                                 Short.MIN_VALUE,
                                 Integer.MIN_VALUE,
-                                Byte.MIN_VALUE,
+                                0,
                                 Double.MIN_VALUE,
                                 -3.40E+38f,
                                 "\0   ",
@@ -174,7 +173,7 @@ public void testAllDatatypes()
                                 Long.MAX_VALUE,
                                 Short.MAX_VALUE,
                                 Integer.MAX_VALUE,
-                                Byte.MAX_VALUE,
+                                255,
                                 Double.MAX_VALUE,
                                 Float.MAX_VALUE,
                                 "abcd",

testing/trino-product-tests/src/main/resources/sql-tests/testcases/connectors/sqlserver/describe_table.sql

@@ -7,7 +7,7 @@ id_employee        | integer     | | |
 first_name         | varchar(32) | | |
 last_name          | varchar(32) | | |
 date_of_employment | date        | | |
-department         | tinyint     | | |
+department         | smallint    | | |
 id_department      | integer     | | |
 name               | varchar(32) | | |
 salary             | integer     | | |