[nifi] branch main updated: NIFI-8392: Translate JDBC CHAR type to RecordFieldType STRING

[pvillard]

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 fe4161b  NIFI-8392: Translate JDBC CHAR type to RecordFieldType STRING
fe4161b is described below

commit fe4161b1c2137e3f7e78e4c6ba557889e05a7bd9
Author: Matthew Burgess <mattyb...@apache.org>
AuthorDate: Wed Nov 3 19:36:04 2021 -0400

    NIFI-8392: Translate JDBC CHAR type to RecordFieldType STRING
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #5506.
---
 .../java/org/apache/nifi/serialization/record/ResultSetRecordSet.java   | 2 +-
 .../org/apache/nifi/serialization/record/ResultSetRecordSetTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 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 37d5f19..5853d32 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
@@ -455,7 +455,7 @@ public class ResultSetRecordSet implements RecordSet, 
Closeable {
             case Types.BOOLEAN:
                 return RecordFieldType.BOOLEAN;
             case Types.CHAR:
-                return RecordFieldType.CHAR;
+                return RecordFieldType.STRING;
             case Types.DATE:
                 return getRecordFieldType(RecordFieldType.DATE, 
useLogicalTypes);
             case Types.NUMERIC:
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 8617fd5..ab28dab 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
@@ -87,7 +87,7 @@ public class ResultSetRecordSetTest {
             new TestColumn(3, COLUMN_NAME_ROWID, Types.ROWID, 
RecordFieldType.LONG.getDataType()),
             new TestColumn(4, COLUMN_NAME_BIT, Types.BIT, 
RecordFieldType.BOOLEAN.getDataType()),
             new TestColumn(5, COLUMN_NAME_BOOLEAN, Types.BOOLEAN, 
RecordFieldType.BOOLEAN.getDataType()),
-            new TestColumn(6, COLUMN_NAME_CHAR, Types.CHAR, 
RecordFieldType.CHAR.getDataType()),
+            new TestColumn(6, COLUMN_NAME_CHAR, Types.CHAR, 
RecordFieldType.STRING.getDataType()),
             new TestColumn(7, COLUMN_NAME_DATE, Types.DATE, 
RecordFieldType.DATE.getDataType()),
             new TestColumn(8, COLUMN_NAME_INTEGER, Types.INTEGER, 
RecordFieldType.INT.getDataType()),
             new TestColumn(9, COLUMN_NAME_DOUBLE, Types.DOUBLE, 
RecordFieldType.DOUBLE.getDataType()),