You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by li...@apache.org on 2026/08/22 13:47:43 UTC
(seatunnel) branch dev updated: [Fix][Connector-V2][Jdbc] Preserve MySQL and PostgreSQL TIME fractional precision (#11891)
This is an automated email from the ASF dual-hosted git repository.
davidzollo pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 6b7f2b8110 [Fix][Connector-V2][Jdbc] Preserve MySQL and PostgreSQL TIME fractional precision (#11891)
6b7f2b8110 is described below
commit 6b7f2b81101d512b929c87e53f97153c5b82f329
Author: JacobZheng0927 <zs...@163.com>
AuthorDate: Sat Aug 22 21:47:36 2026 +0800
[Fix][Connector-V2][Jdbc] Preserve MySQL and PostgreSQL TIME fractional precision (#11891)
---
.../dialect/mysql/MysqlJdbcRowConverter.java | 7 +++
.../dialect/psql/PostgresJdbcRowConverter.java | 11 ++--
.../CopyManagerBatchStatementExecutor.java | 2 +-
.../seatunnel/jdbc/utils/JdbcFieldTypeUtils.java | 38 +++++++++++++
.../dialect/mysql/MysqlJdbcRowConverterTest.java | 64 ++++++++++++++++++++++
.../dialect/psql/PostgresJdbcRowConverterTest.java | 19 +++++++
.../CopyManagerBatchStatementExecutorTest.java | 54 ++++++++++++++++++
.../jdbc/utils/JdbcFieldTypeUtilsTest.java | 51 +++++++++++++++++
8 files changed, 241 insertions(+), 5 deletions(-)
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverter.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverter.java
index d8ecd140f9..a4fe03ca0d 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverter.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverter.java
@@ -19,8 +19,10 @@ package org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.mysql;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.converter.AbstractJdbcRowConverter;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.DatabaseIdentifier;
+import org.apache.seatunnel.connectors.seatunnel.jdbc.utils.JdbcFieldTypeUtils;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -32,6 +34,11 @@ public class MysqlJdbcRowConverter extends AbstractJdbcRowConverter {
return DatabaseIdentifier.MYSQL;
}
+ @Override
+ protected LocalTime readTime(ResultSet rs, int resultSetIndex) throws SQLException {
+ return JdbcFieldTypeUtils.getLocalTime(rs, resultSetIndex);
+ }
+
@Override
protected void writeTime(PreparedStatement statement, int index, LocalTime time)
throws SQLException {
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverter.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverter.java
index ffe1ffec96..a332c7b074 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverter.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverter.java
@@ -46,7 +46,6 @@ import java.sql.Date;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Time;
import java.sql.Timestamp;
import java.time.Duration;
import java.time.LocalDate;
@@ -73,6 +72,12 @@ public class PostgresJdbcRowConverter extends AbstractJdbcRowConverter {
return DatabaseIdentifier.POSTGRESQL;
}
+ @Override
+ protected void writeTime(PreparedStatement statement, int index, LocalTime time)
+ throws SQLException {
+ statement.setObject(index, time);
+ }
+
@Override
protected void setValueToStatementByDataType(
Object value,
@@ -145,9 +150,7 @@ public class PostgresJdbcRowConverter extends AbstractJdbcRowConverter {
Optional.ofNullable(sqlDate).map(e -> e.toLocalDate()).orElse(null);
break;
case TIME:
- Time sqlTime = JdbcFieldTypeUtils.getTime(rs, resultSetIndex);
- fields[fieldIndex] =
- Optional.ofNullable(sqlTime).map(e -> e.toLocalTime()).orElse(null);
+ fields[fieldIndex] = JdbcFieldTypeUtils.getLocalTime(rs, resultSetIndex);
break;
case TIMESTAMP:
// Use getLocalDateTime() which avoids JVM-default-timezone influence.
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutor.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutor.java
index 45f5b0996b..b9c4b9dcdb 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutor.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutor.java
@@ -140,7 +140,7 @@ public class CopyManagerBatchStatementExecutor implements JdbcBatchStatementExec
break;
case TIME:
LocalTime localTime = (LocalTime) record.getField(fieldIndex);
- csvRecord.add((java.sql.Time) java.sql.Time.valueOf(localTime));
+ csvRecord.add(localTime.toString());
break;
case TIMESTAMP:
LocalDateTime localDateTime = (LocalDateTime) record.getField(fieldIndex);
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtils.java b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtils.java
index 08e875a462..949dc37bbd 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtils.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtils.java
@@ -22,9 +22,12 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Time;
import java.sql.Timestamp;
+import java.time.DateTimeException;
import java.time.Instant;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.OffsetDateTime;
+import java.time.OffsetTime;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
@@ -95,6 +98,41 @@ public final class JdbcFieldTypeUtils {
return resultSet.getTime(columnIndex);
}
+ /**
+ * Reads a JDBC TIME as LocalTime, falling back from JDBC 4.2 to plain and offset time text.
+ *
+ * <p>MySQL TIME values outside the 24-hour clock range are not representable as LocalTime; a
+ * fallback parse failure is reported as SQLException instead of silently changing the value.
+ */
+ public static LocalTime getLocalTime(ResultSet resultSet, int columnIndex) throws SQLException {
+ try {
+ return resultSet.getObject(columnIndex, LocalTime.class);
+ } catch (SQLException | AbstractMethodError e) {
+ String value = resultSet.getString(columnIndex);
+ if (value == null) {
+ return null;
+ }
+ try {
+ return LocalTime.parse(value.trim());
+ } catch (DateTimeException ignored) {
+ try {
+ return OffsetTime.parse(value.trim().replaceFirst("([+-]\\d{2})$", "$1:00"))
+ .toLocalTime();
+ } catch (DateTimeException parseException) {
+ SQLException exception =
+ new SQLException(
+ "Unable to parse JDBC TIME value at column "
+ + columnIndex
+ + ": "
+ + value,
+ e);
+ exception.addSuppressed(parseException);
+ throw exception;
+ }
+ }
+ }
+ }
+
public static Timestamp getTimestamp(ResultSet resultSet, int columnIndex) throws SQLException {
return resultSet.getTimestamp(columnIndex);
}
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverterTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverterTest.java
new file mode 100644
index 0000000000..15c65b4e03
--- /dev/null
+++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/mysql/MysqlJdbcRowConverterTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.PhysicalColumn;
+import org.apache.seatunnel.api.table.catalog.TableSchema;
+import org.apache.seatunnel.api.table.type.LocalTimeType;
+import org.apache.seatunnel.api.table.type.SeaTunnelRow;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.time.LocalTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+public class MysqlJdbcRowConverterTest {
+
+ @Test
+ public void testTimeReadAndWritePreserveMicroseconds() throws Exception {
+ LocalTime expected = LocalTime.parse("12:34:56.123456");
+ TableSchema tableSchema =
+ TableSchema.builder()
+ .column(
+ PhysicalColumn.builder()
+ .name("time_col")
+ .dataType(LocalTimeType.LOCAL_TIME_TYPE)
+ .build())
+ .build();
+ MysqlJdbcRowConverter converter = new MysqlJdbcRowConverter();
+ ResultSet resultSet = mock(ResultSet.class);
+ when(resultSet.getObject(1, LocalTime.class)).thenReturn(expected);
+
+ SeaTunnelRow result = converter.toInternal(resultSet, tableSchema);
+ assertEquals(expected, result.getField(0));
+
+ PreparedStatement statement = mock(PreparedStatement.class);
+ converter.toExternal(tableSchema, new SeaTunnelRow(new Object[] {expected}), statement);
+ ArgumentCaptor<Timestamp> timestamp = ArgumentCaptor.forClass(Timestamp.class);
+ verify(statement).setTimestamp(org.mockito.ArgumentMatchers.eq(1), timestamp.capture());
+ assertEquals(expected.getNano(), timestamp.getValue().getNanos());
+ }
+}
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverterTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverterTest.java
index acbdc8122d..9959d035b7 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverterTest.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/psql/PostgresJdbcRowConverterTest.java
@@ -35,6 +35,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
+import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
@@ -160,6 +161,24 @@ public class PostgresJdbcRowConverterTest {
Assertions.assertNull(row.getField(1), "timestamp_tz_col should be null");
}
+ @Test
+ public void testTimeReadAndWritePreserveMicroseconds() throws SQLException {
+ LocalTime expected = LocalTime.parse("12:34:56.123456");
+ ResultSet rs = mock(ResultSet.class);
+ TableSchema tableSchema =
+ createTableSchema("time_col", LocalTimeType.LOCAL_TIME_TYPE, "time(6)");
+ setupMockResultSet(rs, "INT4", "TIME", 1, expected);
+ when(rs.getObject(2, LocalTime.class)).thenReturn(expected);
+
+ SeaTunnelRow result = converter.toInternal(rs, tableSchema);
+ Assertions.assertEquals(expected, result.getField(1));
+
+ PreparedStatement statement = mock(PreparedStatement.class);
+ converter.toExternal(
+ tableSchema, null, new SeaTunnelRow(new Object[] {1, expected}), statement);
+ verify(statement).setObject(2, expected);
+ }
+
@Test
public void testToInternalWithGeometryType() throws SQLException {
ResultSet rs = mock(ResultSet.class);
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutorTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutorTest.java
new file mode 100644
index 0000000000..6b6000f061
--- /dev/null
+++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/executor/CopyManagerBatchStatementExecutorTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.executor;
+
+import org.apache.seatunnel.api.table.catalog.PhysicalColumn;
+import org.apache.seatunnel.api.table.catalog.TableSchema;
+import org.apache.seatunnel.api.table.type.LocalTimeType;
+import org.apache.seatunnel.api.table.type.SeaTunnelRow;
+
+import org.apache.commons.csv.CSVPrinter;
+
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalTime;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class CopyManagerBatchStatementExecutorTest {
+
+ @Test
+ public void testTimeValuePreservesMicroseconds() throws Exception {
+ TableSchema tableSchema =
+ TableSchema.builder()
+ .column(
+ PhysicalColumn.builder()
+ .name("time_col")
+ .dataType(LocalTimeType.LOCAL_TIME_TYPE)
+ .build())
+ .build();
+ CopyManagerBatchStatementExecutor executor =
+ new CopyManagerBatchStatementExecutor("COPY test", tableSchema);
+ executor.csvPrinter = new CSVPrinter(new StringBuilder(), executor.csvFormat);
+
+ executor.addToBatch(new SeaTunnelRow(new Object[] {LocalTime.parse("12:34:56.123456")}));
+ executor.csvPrinter.flush();
+
+ assertTrue(executor.csvPrinter.getOut().toString().contains("12:34:56.123456"));
+ }
+}
diff --git a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtilsTest.java b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtilsTest.java
index f9ac9cb819..4b3ae4f36a 100644
--- a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtilsTest.java
+++ b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcFieldTypeUtilsTest.java
@@ -21,8 +21,10 @@ import org.junit.jupiter.api.Test;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.sql.Timestamp;
import java.time.Instant;
+import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.Date;
@@ -33,6 +35,55 @@ import static org.mockito.Mockito.when;
public class JdbcFieldTypeUtilsTest {
+ @Test
+ public void testGetLocalTimePreservesMicroseconds() throws SQLException {
+ LocalTime expected = LocalTime.parse("12:34:56.123456");
+ ResultSet rs = mock(ResultSet.class);
+ when(rs.getObject(1, LocalTime.class)).thenReturn(expected);
+
+ assertEquals(expected, JdbcFieldTypeUtils.getLocalTime(rs, 1));
+ }
+
+ @Test
+ public void testGetLocalTimeFallsBackToFractionalText() throws SQLException {
+ ResultSet rs = mock(ResultSet.class);
+ when(rs.getObject(1, LocalTime.class)).thenThrow(new SQLFeatureNotSupportedException());
+ when(rs.getString(1)).thenReturn("12:34:56.123456");
+
+ assertEquals(LocalTime.parse("12:34:56.123456"), JdbcFieldTypeUtils.getLocalTime(rs, 1));
+ }
+
+ @Test
+ public void testGetLocalTimeFallsBackToOffsetTimeText() throws SQLException {
+ ResultSet rs = mock(ResultSet.class);
+ when(rs.getObject(1, LocalTime.class)).thenThrow(new SQLException("unsupported time type"));
+ when(rs.getString(1)).thenReturn("12:34:56.123456+08:00");
+
+ assertEquals(LocalTime.parse("12:34:56.123456"), JdbcFieldTypeUtils.getLocalTime(rs, 1));
+ }
+
+ @Test
+ public void testGetLocalTimeFallsBackToShortOffsetTimeText() throws SQLException {
+ ResultSet rs = mock(ResultSet.class);
+ when(rs.getObject(1, LocalTime.class)).thenThrow(new SQLException("unsupported time type"));
+ when(rs.getString(1)).thenReturn("12:34:56.123456+08");
+
+ assertEquals(LocalTime.parse("12:34:56.123456"), JdbcFieldTypeUtils.getLocalTime(rs, 1));
+ }
+
+ @Test
+ public void testGetLocalTimeReportsUnparseableFallbackTextAsSqlException() throws SQLException {
+ ResultSet rs = mock(ResultSet.class);
+ SQLException original = new SQLException("unsupported time type");
+ when(rs.getObject(1, LocalTime.class)).thenThrow(original);
+ when(rs.getString(1)).thenReturn("24:00:00");
+
+ SQLException exception =
+ org.junit.jupiter.api.Assertions.assertThrows(
+ SQLException.class, () -> JdbcFieldTypeUtils.getLocalTime(rs, 1));
+ assertEquals(original, exception.getCause());
+ }
+
@Test
public void testGetOffsetDateTimeFromTimestampUsesInstant() throws SQLException {
Instant instant = Instant.parse("2025-01-01T00:00:00Z");