[Hotfix][Jdbc] Fix mysql tinyint(1) type mapping for TypeMapper (#9012)

hailin0 · web-flow · commit 5f85d7668a25 · 2025-03-26T18:00:09.000+08:00
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeMapper.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeMapper.java
@@ -48,6 +48,7 @@ public Column mappingColumn(ResultSetMetaData metadata, int colIndex) throws SQL
         String columnName = metadata.getColumnLabel(colIndex);
         // e.g. tinyint unsigned
         String nativeType = metadata.getColumnTypeName(colIndex);
+        String columnType = nativeType;
         int isNullable = metadata.isNullable(colIndex);
         int precision = metadata.getPrecision(colIndex);
         int scale = metadata.getScale(colIndex);
@@ -56,11 +57,14 @@ public Column mappingColumn(ResultSetMetaData metadata, int colIndex) throws SQL
             long octetLength = TypeDefineUtils.charTo4ByteLength((long) precision);
             precision = (int) Math.max(precision, octetLength);
         }
+        if ("tinyint".equalsIgnoreCase(nativeType) && precision == 1) {
+            columnType = "tinyint(1)";
+        }
 
         BasicTypeDefine typeDefine =
                 BasicTypeDefine.builder()
                         .name(columnName)
-                        .columnType(nativeType)
+                        .columnType(columnType)
                         .dataType(nativeType)
                         .nullable(isNullable == ResultSetMetaData.columnNullable)
                         .length((long) precision)
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeMapper.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeMapper.java
@@ -48,6 +48,7 @@ public Column mappingColumn(ResultSetMetaData metadata, int colIndex) throws SQL
         String columnName = metadata.getColumnLabel(colIndex);
         // e.g. tinyint unsigned
         String nativeType = metadata.getColumnTypeName(colIndex);
+        String columnType = nativeType;
         int isNullable = metadata.isNullable(colIndex);
         int precision = metadata.getPrecision(colIndex);
         int scale = metadata.getScale(colIndex);
@@ -56,11 +57,14 @@ public Column mappingColumn(ResultSetMetaData metadata, int colIndex) throws SQL
             long octetLength = TypeDefineUtils.charTo4ByteLength((long) precision);
             precision = (int) Math.max(precision, octetLength);
         }
+        if ("tinyint".equalsIgnoreCase(nativeType) && precision == 1) {
+            columnType = "tinyint(1)";
+        }
 
         BasicTypeDefine typeDefine =
                 BasicTypeDefine.builder()
                         .name(columnName)
-                        .columnType(nativeType)
+                        .columnType(columnType)
                         .dataType(nativeType)
                         .nullable(isNullable == ResultSetMetaData.columnNullable)
                         .length((long) precision)
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeMapperTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeMapperTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.mysql;
+
+import org.apache.seatunnel.api.table.catalog.Column;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class MySqlTypeMapperTest {
+    @Test
+    void returnsTinyint1WhenNativeTypeIsTinyintAndPrecisionIs1() throws SQLException {
+        ResultSetMetaData metadata = mock(ResultSetMetaData.class);
+        when(metadata.getColumnLabel(1)).thenReturn("test_column");
+        when(metadata.getColumnTypeName(1)).thenReturn("tinyint");
+        when(metadata.isNullable(1)).thenReturn(ResultSetMetaData.columnNullable);
+        when(metadata.getPrecision(1)).thenReturn(1);
+        when(metadata.getScale(1)).thenReturn(0);
+
+        MySqlTypeMapper typeMapper = new MySqlTypeMapper();
+        Column column = typeMapper.mappingColumn(metadata, 1);
+
+        assertEquals("tinyint(1)", column.getSourceType());
+    }
+
+    @Test
+    void returnsOriginalTypeWhenNativeTypeIsTinyintAndPrecisionIsNot1() throws SQLException {
+        ResultSetMetaData metadata = mock(ResultSetMetaData.class);
+        when(metadata.getColumnLabel(1)).thenReturn("test_column");
+        when(metadata.getColumnTypeName(1)).thenReturn("tinyint");
+        when(metadata.isNullable(1)).thenReturn(ResultSetMetaData.columnNullable);
+        when(metadata.getPrecision(1)).thenReturn(2);
+        when(metadata.getScale(1)).thenReturn(0);
+
+        MySqlTypeMapper typeMapper = new MySqlTypeMapper();
+        Column column = typeMapper.mappingColumn(metadata, 1);
+
+        assertEquals("tinyint", column.getSourceType());
+    }
+}
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeMapperTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeMapperTest.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.oceanbase;
+
+import org.apache.seatunnel.api.table.catalog.Column;
+
+import org.junit.jupiter.api.Test;
+
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class OceanBaseMySqlTypeMapperTest {
+    @Test
+    void returnsTinyint1WhenNativeTypeIsTinyintAndPrecisionIs1() throws SQLException {
+        ResultSetMetaData metadata = mock(ResultSetMetaData.class);
+        when(metadata.getColumnLabel(1)).thenReturn("test_column");
+        when(metadata.getColumnTypeName(1)).thenReturn("tinyint");
+        when(metadata.isNullable(1)).thenReturn(ResultSetMetaData.columnNullable);
+        when(metadata.getPrecision(1)).thenReturn(1);
+        when(metadata.getScale(1)).thenReturn(0);
+
+        OceanBaseMySqlTypeMapper typeMapper = new OceanBaseMySqlTypeMapper();
+        Column column = typeMapper.mappingColumn(metadata, 1);
+
+        assertEquals("tinyint(1)", column.getSourceType());
+    }
+
+    @Test
+    void returnsOriginalTypeWhenNativeTypeIsTinyintAndPrecisionIsNot1() throws SQLException {
+        ResultSetMetaData metadata = mock(ResultSetMetaData.class);
+        when(metadata.getColumnLabel(1)).thenReturn("test_column");
+        when(metadata.getColumnTypeName(1)).thenReturn("tinyint");
+        when(metadata.isNullable(1)).thenReturn(ResultSetMetaData.columnNullable);
+        when(metadata.getPrecision(1)).thenReturn(2);
+        when(metadata.getScale(1)).thenReturn(0);
+
+        OceanBaseMySqlTypeMapper typeMapper = new OceanBaseMySqlTypeMapper();
+        Column column = typeMapper.mappingColumn(metadata, 1);
+
+        assertEquals("tinyint", column.getSourceType());
+    }
+}
