This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/dev/pr-13076-25f6fe551181dbb2d2ee7d0eac1e236d97587b17 in repository https://gitbox.apache.org/repos/asf/seatunnel.git
commit d4fc1f93148011c175c27a6011feff6a1efc3c33 Author: Sepuri Sai Krishna <[email protected]> AuthorDate: Sat Nov 7 03:05:51 2026 +0000 [Fix][Connector-V2][JDBC] Read MySQL and OceanBase column types independently of the default locale (#13076) --- .../seatunnel/jdbc/catalog/mysql/MySqlCatalog.java | 3 +- .../catalog/oceanbase/OceanBaseMySqlCatalog.java | 5 +- .../internal/dialect/mysql/MySqlTypeConverter.java | 2 +- .../oceanbase/OceanBaseMySqlTypeConverter.java | 6 +- .../mysql/MySqlCatalogUnsignedDetectionTest.java | 41 ++++++++++- .../oceanbase/OceanBaseMySqlCatalogTest.java | 85 ++++++++++++++++++++++ .../dialect/mysql/MySqlTypeConverterTest.java | 41 +++++++++++ .../oceanbase/OceanBaseMySqlTypeConverterTest.java | 32 ++++++++ .../connectors/seatunnel/jdbc/JdbcMysqlIT.java | 63 ++++++++++++++++ .../seatunnel/jdbc/JdbcOceanBaseMysqlIT.java | 63 ++++++++++++++++ 10 files changed, 334 insertions(+), 7 deletions(-) diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java index 4a3bdf642ca..075405a04fa 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalog.java @@ -49,6 +49,7 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Optional; import java.util.Properties; @@ -221,7 +222,7 @@ public class MySqlCatalog extends AbstractJdbcCatalog { // e.g. tinyint(1) unsigned String columnType = resultSet.getString("COLUMN_TYPE"); // e.g. tinyint - String dataType = resultSet.getString("DATA_TYPE").toUpperCase(); + String dataType = resultSet.getString("DATA_TYPE").toUpperCase(Locale.ROOT); String comment = resultSet.getString("COLUMN_COMMENT"); Object defaultValue = resultSet.getObject("COLUMN_DEFAULT"); String isNullableStr = resultSet.getString("IS_NULLABLE"); diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java index 1fa3a57c9dd..64eb96741e1 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalog.java @@ -49,6 +49,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Locale; @Slf4j public class OceanBaseMySqlCatalog extends AbstractJdbcCatalog { @@ -142,12 +143,12 @@ public class OceanBaseMySqlCatalog extends AbstractJdbcCatalog { // e.g. tinyint(1) unsigned String columnType = resultSet.getString("COLUMN_TYPE"); // e.g. tinyint - String dataType = resultSet.getString("DATA_TYPE").toUpperCase(); + String dataType = resultSet.getString("DATA_TYPE").toUpperCase(Locale.ROOT); String comment = resultSet.getString("COLUMN_COMMENT"); Object defaultValue = resultSet.getObject("COLUMN_DEFAULT"); String isNullableStr = resultSet.getString("IS_NULLABLE"); - if (dataType.toUpperCase().startsWith("VECTOR")) { + if (dataType.startsWith("VECTOR")) { dataType = "VECTOR"; } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverter.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverter.java index dc65d4af980..048b97230c3 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverter.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverter.java @@ -196,7 +196,7 @@ public class MySqlTypeConverter implements TypeConverter<BasicTypeDefine<MysqlTy .defaultValue(typeDefine.getDefaultValue()) .comment(typeDefine.getComment()); - String mysqlDataType = typeDefine.getDataType().toUpperCase(); + String mysqlDataType = typeDefine.getDataType().toUpperCase(Locale.ROOT); if (mysqlDataType.endsWith("ZEROFILL")) { mysqlDataType = mysqlDataType.substring(0, mysqlDataType.length() - "ZEROFILL".length()).trim(); diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverter.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverter.java index ca426551b4c..49e36af56f5 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverter.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverter.java @@ -35,6 +35,8 @@ import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.DatabaseI import com.google.auto.service.AutoService; import lombok.extern.slf4j.Slf4j; +import java.util.Locale; + @Slf4j @AutoService(TypeConverter.class) public class OceanBaseMySqlTypeConverter @@ -121,7 +123,7 @@ public class OceanBaseMySqlTypeConverter .defaultValue(typeDefine.getDefaultValue()) .comment(typeDefine.getComment()); - String mysqlDataType = typeDefine.getDataType().toUpperCase(); + String mysqlDataType = typeDefine.getDataType().toUpperCase(Locale.ROOT); if (typeDefine.isUnsigned() && !(mysqlDataType.endsWith(" UNSIGNED"))) { mysqlDataType = mysqlDataType + " UNSIGNED"; } @@ -299,7 +301,7 @@ public class OceanBaseMySqlTypeConverter builder.scale(typeDefine.getScale()); break; case VECTOR_NAME: - String columnType = typeDefine.getColumnType().toUpperCase(); + String columnType = typeDefine.getColumnType().toUpperCase(Locale.ROOT); if (columnType.startsWith("VECTOR(") && columnType.endsWith(")")) { Integer number = Integer.parseInt( diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalogUnsignedDetectionTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalogUnsignedDetectionTest.java index 1accb319771..8315ed8b9b2 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalogUnsignedDetectionTest.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/mysql/MySqlCatalogUnsignedDetectionTest.java @@ -20,6 +20,7 @@ package org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.mysql; import org.apache.seatunnel.api.table.catalog.Column; import org.apache.seatunnel.api.table.catalog.exception.CatalogException; import org.apache.seatunnel.api.table.type.BasicType; +import org.apache.seatunnel.api.table.type.LocalTimeType; import org.apache.seatunnel.common.utils.JdbcUrlUtil; import org.junit.jupiter.api.Assertions; @@ -28,13 +29,14 @@ import org.junit.jupiter.api.Test; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; +import java.util.Locale; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; /** * Regression tests for how {@link MySqlCatalog#buildColumn(ResultSet)} derives the UNSIGNED - * attribute from {@code COLUMN_TYPE}. + * attribute from {@code COLUMN_TYPE}, and how it reads {@code DATA_TYPE}. * * <p>They need no MySQL server. The catalog constructor probes the server version, so the test * catalog overrides connection acquisition and lets the probe fail, which is the production @@ -111,4 +113,41 @@ class MySqlCatalogUnsignedDetectionTest { } }; } + + /** + * MySQL reports {@code DATA_TYPE} in lower case, for example {@code int} or {@code datetime}. + * Under {@code tr-TR} and {@code az-AZ}, upper casing it with the default locale gave {@code + * İNT}, which matched no type, so reading the table failed. + */ + @Test + void shouldReadLowerCaseDataTypeUnderAnyDefaultLocale() throws SQLException { + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try { + for (Locale locale : new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + Assertions.assertEquals( + BasicType.INT_TYPE, + buildColumn("int(10)", "int").getDataType(), + locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + buildColumn("int(10) unsigned", "int").getDataType(), + locale.toString()); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + buildColumn("datetime", "datetime").getDataType(), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + } + } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalogTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalogTest.java new file mode 100644 index 00000000000..a11bc2e1cf0 --- /dev/null +++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/oceanbase/OceanBaseMySqlCatalogTest.java @@ -0,0 +1,85 @@ +/* + * 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.catalog.oceanbase; + +import org.apache.seatunnel.api.table.catalog.Column; +import org.apache.seatunnel.api.table.type.BasicType; +import org.apache.seatunnel.api.table.type.LocalTimeType; +import org.apache.seatunnel.common.utils.JdbcUrlUtil; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Locale; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** Offline tests for {@link OceanBaseMySqlCatalog#buildColumn(ResultSet)}. */ +class OceanBaseMySqlCatalogTest { + + /** + * {@code DATA_TYPE} comes in lower case, as in MySQL. Under {@code tr-TR} and {@code az-AZ}, + * upper casing it with the default locale gave {@code İNT}, which matched no type. + */ + @Test + void shouldReadLowerCaseDataTypeUnderAnyDefaultLocale() throws SQLException { + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try { + for (Locale locale : new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + Assertions.assertEquals( + BasicType.INT_TYPE, + buildColumn("int(11)", "int").getDataType(), + locale.toString()); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + buildColumn("datetime", "datetime").getDataType(), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + } + } + + private static Column buildColumn(String columnType, String dataType) throws SQLException { + ResultSet resultSet = mock(ResultSet.class); + when(resultSet.getString("COLUMN_NAME")).thenReturn("test"); + when(resultSet.getString("COLUMN_TYPE")).thenReturn(columnType); + when(resultSet.getString("DATA_TYPE")).thenReturn(dataType); + when(resultSet.getString("IS_NULLABLE")).thenReturn("YES"); + // The constructor does not connect, so no server is needed. + return new OceanBaseMySqlCatalog( + "oceanbase", + "user", + "pwd", + JdbcUrlUtil.getUrlInfo("jdbc:mysql://127.0.0.1:2881/test"), + "com.mysql.cj.jdbc.Driver") + .buildColumn(resultSet); + } +} diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverterTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverterTest.java index b86177eb11a..eb012d6ff4b 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverterTest.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MySqlTypeConverterTest.java @@ -1306,4 +1306,45 @@ public class MySqlTypeConverterTest { column = MySqlTypeConverter.DEFAULT_INSTANCE.convert(typeDefine); Assertions.assertEquals(100, column.getColumnLength()); } + + @Test + public void testConvertDoesNotDependOnTheDefaultLocale() { + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try { + for (Locale locale : new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + Assertions.assertEquals( + BasicType.INT_TYPE, convert("int", "int"), locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + convert("int unsigned", "int(10) unsigned"), + locale.toString()); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + convert("datetime", "datetime"), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + } + } + + private static Object convert(String dataType, String columnType) { + return MySqlTypeConverter.DEFAULT_INSTANCE + .convert( + BasicTypeDefine.builder() + .name("test") + .columnType(columnType) + .dataType(dataType) + .build()) + .getDataType(); + } } diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverterTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverterTest.java index 6104e3b0baf..b6e6767bd88 100644 --- a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverterTest.java +++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oceanbase/OceanBaseMySqlTypeConverterTest.java @@ -25,6 +25,8 @@ import org.apache.seatunnel.api.table.type.LocalTimeType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import java.util.Locale; + /** * Unit tests for {@link OceanBaseMySqlTypeConverter} verifying the NTZ/LTZ timestamp split * introduced by the fix for https://github.com/apache/seatunnel/issues/10685. @@ -90,4 +92,34 @@ public class OceanBaseMySqlTypeConverterTest { Assertions.assertEquals( OceanBaseMySqlTypeConverter.MYSQL_TIMESTAMP, typeDefine.getDataType()); } + + @Test + public void testConvertDoesNotDependOnTheDefaultLocale() { + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try { + for (Locale locale : new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + BasicTypeDefine<Object> typeDefine = + BasicTypeDefine.builder() + .name("test") + .columnType("datetime") + .dataType("datetime") + .build(); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + OceanBaseMySqlTypeConverter.INSTANCE.convert(typeDefine).getDataType(), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + } + } } diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java index 28b2c6718d6..81ae487342c 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-1/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcMysqlIT.java @@ -34,6 +34,7 @@ import org.apache.seatunnel.api.table.converter.BasicTypeDefine; import org.apache.seatunnel.api.table.factory.TableSinkFactoryContext; import org.apache.seatunnel.api.table.factory.TableSourceFactoryContext; import org.apache.seatunnel.api.table.type.BasicType; +import org.apache.seatunnel.api.table.type.LocalTimeType; import org.apache.seatunnel.api.table.type.SeaTunnelRow; import org.apache.seatunnel.common.utils.JdbcUrlUtil; import org.apache.seatunnel.common.utils.ReflectionUtils; @@ -87,6 +88,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Properties; import java.util.concurrent.ExecutorService; @@ -628,6 +630,67 @@ public class JdbcMysqlIT extends AbstractJdbcIT { } } + /** + * MySQL reports {@code DATA_TYPE} in lower case, for example {@code int} or {@code datetime}. + * Under {@code tr-TR} and {@code az-AZ}, upper casing it with the default locale gave {@code + * İNT}, which matched no type, so reading the table from the catalog failed. + */ + @Test + public void testCatalogReadsColumnTypesUnderTurkishLocale() throws SQLException { + String tableName = "locale_type_source"; + String createSql = + "CREATE TABLE IF NOT EXISTS `" + + MYSQL_DATABASE + + "`.`" + + tableName + + "` (" + + " `c_int` int DEFAULT NULL," + + " `c_int_unsigned` int unsigned DEFAULT NULL," + + " `c_bigint` bigint DEFAULT NULL," + + " `c_datetime` datetime DEFAULT NULL)"; + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try (Statement statement = connection.createStatement()) { + statement.execute(createSql); + try { + for (Locale locale : + new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + TableSchema tableSchema = + catalog.getTable(TablePath.of(MYSQL_DATABASE, tableName)) + .getTableSchema(); + Assertions.assertEquals( + BasicType.INT_TYPE, + tableSchema.getColumn("c_int").getDataType(), + locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + tableSchema.getColumn("c_int_unsigned").getDataType(), + locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + tableSchema.getColumn("c_bigint").getDataType(), + locale.toString()); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + tableSchema.getColumn("c_datetime").getDataType(), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + statement.execute( + "DROP TABLE IF EXISTS `" + MYSQL_DATABASE + "`.`" + tableName + "`"); + } + } + } + void defaultSinkParametersTest() throws SQLException, ClassNotFoundException { TableSchema tableSchema = TableSchema.builder() diff --git a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java index cb2ba26d9ee..2e9bf2cdd26 100644 --- a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java +++ b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-jdbc-e2e/connector-jdbc-e2e-part-2/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/JdbcOceanBaseMysqlIT.java @@ -23,6 +23,7 @@ import org.apache.seatunnel.shade.org.apache.commons.lang3.tuple.Pair; import org.apache.seatunnel.api.table.catalog.TablePath; import org.apache.seatunnel.api.table.catalog.TableSchema; import org.apache.seatunnel.api.table.type.BasicType; +import org.apache.seatunnel.api.table.type.LocalTimeType; import org.apache.seatunnel.api.table.type.SeaTunnelRow; import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException; import org.apache.seatunnel.common.utils.JdbcUrlUtil; @@ -50,6 +51,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Locale; import java.util.Map; public class JdbcOceanBaseMysqlIT extends JdbcOceanBaseITBase { @@ -338,6 +340,67 @@ public class JdbcOceanBaseMysqlIT extends JdbcOceanBaseITBase { } } + /** + * OceanBase reports {@code DATA_TYPE} in lower case, for example {@code int} or {@code + * datetime}. Under {@code tr-TR} and {@code az-AZ}, upper casing it with the default locale + * gave {@code İNT}, which matched no type, so reading the table from the catalog failed. + */ + @Test + public void testCatalogReadsColumnTypesUnderTurkishLocale() throws SQLException { + String tableName = "locale_type_source"; + String createSql = + "CREATE TABLE IF NOT EXISTS `" + + OCEANBASE_DATABASE + + "`.`" + + tableName + + "` (" + + " `c_int` int DEFAULT NULL," + + " `c_int_unsigned` int unsigned DEFAULT NULL," + + " `c_bigint` bigint DEFAULT NULL," + + " `c_datetime` datetime DEFAULT NULL)"; + Locale[] saved = { + Locale.getDefault(), + Locale.getDefault(Locale.Category.FORMAT), + Locale.getDefault(Locale.Category.DISPLAY) + }; + try (Statement statement = connection.createStatement()) { + statement.execute(createSql); + try { + for (Locale locale : + new Locale[] {new Locale("tr", "TR"), new Locale("az", "AZ")}) { + // Upper casing "i" gives a dotted capital I under these locales. + Locale.setDefault(locale); + TableSchema tableSchema = + catalog.getTable(TablePath.of(OCEANBASE_DATABASE, tableName)) + .getTableSchema(); + Assertions.assertEquals( + BasicType.INT_TYPE, + tableSchema.getColumn("c_int").getDataType(), + locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + tableSchema.getColumn("c_int_unsigned").getDataType(), + locale.toString()); + Assertions.assertEquals( + BasicType.LONG_TYPE, + tableSchema.getColumn("c_bigint").getDataType(), + locale.toString()); + Assertions.assertEquals( + LocalTimeType.LOCAL_DATE_TIME_TYPE, + tableSchema.getColumn("c_datetime").getDataType(), + locale.toString()); + } + } finally { + // The base locale first, because setting it overwrites both category defaults. + Locale.setDefault(saved[0]); + Locale.setDefault(Locale.Category.FORMAT, saved[1]); + Locale.setDefault(Locale.Category.DISPLAY, saved[2]); + statement.execute( + "DROP TABLE IF EXISTS `" + OCEANBASE_DATABASE + "`.`" + tableName + "`"); + } + } + } + @Override OceanBaseCEContainer initContainer() { return new OceanBaseCEContainer(IMAGE)
