Skip to content

Add support for zero dates in mysql mapping #6750

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

Merged
graytaylor0 merged 1 commit into from
Apr 10, 2026
Merged

Add support for zero dates in mysql mapping #6750

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
5 changes: 4 additions & 1 deletion ...opensearch/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ private Long handleTime(final String timeStr) {
private Long handleDate(final String dateStr) {
try {
// Handle MySQL zero date special case
if ("0000-00-00".equals(dateStr)) {
if (dateStr.matches("^0000-.*|.*-00-.*|.*-00$")) {
return null;
}

Expand All @@ -107,6 +107,9 @@ private Long handleDate(final String dateStr) {

private Long handleDateTime(final String dateTimeStr) {
try {
if (dateTimeStr.startsWith("0000-00-00")) {
return null;
}
final Long dateTimeEpoch = parseDateTimeStrAsEpochMillis(dateTimeStr);
if (dateTimeEpoch != null) return dateTimeEpoch;

Expand Down
10 changes: 7 additions & 3 deletions ...search/dataprepper/plugins/source/rds/datatype/mysql/handler/TemporalTypeHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ private static Stream<Arguments> provideDateTestCases() {
Arguments.of("1970-01-01", getEpochMillisFromDate(1970, 1, 1)),
Arguments.of("2024-02-29", getEpochMillisFromDate(2024, 2, 29)), // Leap year
Arguments.of("0000-00-00", null),
Arguments.of("1684108800000", getEpochMillisFromDate(2023, 5, 15))
Arguments.of("1684108800000", getEpochMillisFromDate(2023, 5, 15),
Arguments.of("1997-00-01", null),
Arguments.of("0000-01-12", null),
Arguments.of("1997-01-00", null))
);
}

Expand Down Expand Up @@ -94,7 +97,7 @@ private static Stream<Arguments> provideTimeTestCases() {

@ParameterizedTest
@MethodSource("provideDateTimeTestCases")
void handle_withDateTimeType_returnsCorrectEpochMillis(String input, long expected) {
void handle_withDateTimeType_returnsCorrectEpochMillis(String input, Long expected) {
Long result = temporalTypeHandler.handle(MySQLDataType.DATETIME, "datetime_column", input, null);
assertEquals(expected, result);
}
Expand All @@ -104,7 +107,8 @@ private static Stream<Arguments> provideDateTimeTestCases() {
Arguments.of("2023-12-25 14:30:00.123456", getEpochMillis(2023, 12, 25, 14, 30, 0, 123456000)),
Arguments.of("1970-01-01 00:00:00", getEpochMillis(1970, 1, 1, 0, 0, 0, 0)),
Arguments.of("1703509900000", 1703509900000L),
Arguments.of("1784161123456789", 1784161123456L)
Arguments.of("1784161123456789", 1784161123456L),
Arguments.of("0000-00-00 14:30:00.123456", null)
);
}

Expand Down
Loading