This is an automated email from the ASF dual-hosted git repository. turcsanyi pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new b12572af20 NIFI-11367 Database DATE value displayed incorrectly in record output if timezone is GMT-X b12572af20 is described below commit b12572af200fcdb33f37ef60683402bc408ffce8 Author: krisztina-zsihovszki <zsikr...@gmail.com> AuthorDate: Thu Mar 30 17:25:28 2023 +0200 NIFI-11367 Database DATE value displayed incorrectly in record output if timezone is GMT-X This closes #7103. Signed-off-by: Peter Turcsanyi <turcsa...@apache.org> --- .../org/apache/nifi/serialization/record/ResultSetRecordSet.java | 7 ------- .../apache/nifi/serialization/record/ResultSetRecordSetTest.java | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java index d2c4f6cb09..84a7b4569a 100644 --- a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java +++ b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java @@ -19,7 +19,6 @@ package org.apache.nifi.serialization.record; import org.apache.nifi.serialization.SimpleRecordSchema; import org.apache.nifi.serialization.record.type.ArrayDataType; -import org.apache.nifi.serialization.record.util.DataTypeUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,12 +157,6 @@ public class ResultSetRecordSet implements RecordSet, Closeable { return null; } - if (value instanceof java.sql.Date) { - // Date objects should be stored in records as UTC normalized dates (UTC 00:00:00) - // but they come from the driver in JVM's local time zone 00:00:00 and need to be converted. - return DataTypeUtils.convertDateToUTC((java.sql.Date) value); - } - if (value instanceof List) { return ((List) value).toArray(); } diff --git a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java index 9b469a2e56..e9e5ec861b 100644 --- a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java +++ b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/ResultSetRecordSetTest.java @@ -42,7 +42,6 @@ import java.sql.Timestamp; import java.sql.Types; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -310,9 +309,7 @@ public class ResultSetRecordSetTest { assertEquals(booleanValue, record.getAsBoolean(COLUMN_NAME_BOOLEAN)); assertEquals(charValue, record.getValue(COLUMN_NAME_CHAR)); - // Date is expected in UTC normalized form - Date expectedDate = new Date(testDate.atStartOfDay(ZoneOffset.UTC).toInstant().toEpochMilli()); - assertEquals(expectedDate, record.getAsDate(COLUMN_NAME_DATE, null)); + assertEquals(dateValue, record.getAsDate(COLUMN_NAME_DATE, null)); assertEquals(timestampValue, DataTypeUtils.toTimestamp(record.getValue(COLUMN_NAME_TIMESTAMP), null, COLUMN_NAME_TIMESTAMP)); assertEquals(integerValue, record.getAsInt(COLUMN_NAME_INTEGER));