You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2022/06/03 08:33:49 UTC
[nifi] branch main updated: NIFI-10057: Add support for SQL Server's DATETIMEOFFSET type to ExecuteSQL processors
This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 639ab328c9 NIFI-10057: Add support for SQL Server's DATETIMEOFFSET type to ExecuteSQL processors
639ab328c9 is described below
commit 639ab328c9e717e259740133a5571b9ab7123f0d
Author: Matthew Burgess <ma...@apache.org>
AuthorDate: Wed May 25 16:21:40 2022 -0400
NIFI-10057: Add support for SQL Server's DATETIMEOFFSET type to ExecuteSQL processors
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #6080.
---
.../java/org/apache/nifi/serialization/record/ResultSetRecordSet.java | 1 +
.../src/main/java/org/apache/nifi/util/db/JdbcCommon.java | 1 +
2 files changed, 2 insertions(+)
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 8ce2255ab2..d2c4f6cb09 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
@@ -526,6 +526,7 @@ public class ResultSetRecordSet implements RecordSet, Closeable {
case Types.TIMESTAMP_WITH_TIMEZONE:
case -101: // Oracle's TIMESTAMP WITH TIME ZONE
case -102: // Oracle's TIMESTAMP WITH LOCAL TIME ZONE
+ case -155: // SQL Server's DATETIMEOFFSET
return getRecordFieldType(TIMESTAMP, useLogicalTypes);
}
diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
index 30e6c51c68..b78408c912 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/main/java/org/apache/nifi/util/db/JdbcCommon.java
@@ -635,6 +635,7 @@ public class JdbcCommon {
case TIMESTAMP_WITH_TIMEZONE:
case -101: // Oracle's TIMESTAMP WITH TIME ZONE
case -102: // Oracle's TIMESTAMP WITH LOCAL TIME ZONE
+ case -155: // SQL Server's DATETIMEOFFSET
addNullableField(builder, columnName,
u -> options.useLogicalTypes
? u.type(LogicalTypes.timestampMillis().addToSchema(SchemaBuilder.builder().longType()))