[nifi] branch main updated: NIFI-8470: Fix DataTypeUtils for CHAR() sequences

[mattyb149]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 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 fdda358  NIFI-8470: Fix DataTypeUtils for CHAR() sequences
fdda358 is described below

commit fdda3582e3f60da74d82713e8677a1560d04a008
Author: Sandro Tolaini <sandro.tola...@gmail.com>
AuthorDate: Tue May 11 22:10:41 2021 +0200

    NIFI-8470: Fix DataTypeUtils for CHAR() sequences
    
    NIFI-8470: Added unit test
    
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>
    
    This closes #5027
---
 .../java/org/apache/nifi/serialization/record/util/DataTypeUtils.java  | 3 +--
 .../java/org/apache/nifi/serialization/record/TestDataTypeUtils.java   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
index cd3cd4f..20fc472 100644
--- 
a/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
@@ -1974,8 +1974,6 @@ public class DataTypeUtils {
                 return RecordFieldType.BOOLEAN.getDataType();
             case Types.TINYINT:
                 return RecordFieldType.BYTE.getDataType();
-            case Types.CHAR:
-                return RecordFieldType.CHAR.getDataType();
             case Types.DATE:
                 return RecordFieldType.DATE.getDataType();
             case Types.DOUBLE:
@@ -1988,6 +1986,7 @@ public class DataTypeUtils {
                 return RecordFieldType.INT.getDataType();
             case Types.SMALLINT:
                 return RecordFieldType.SHORT.getDataType();
+            case Types.CHAR:
             case Types.VARCHAR:
             case Types.LONGNVARCHAR:
             case Types.LONGVARCHAR:
diff --git 
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
 
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
index 4745abe..a1aae73 100644
--- 
a/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
+++ 
b/nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java
@@ -366,6 +366,7 @@ public class TestDataTypeUtils {
     public void testGetDataTypeFromSQLTypeValue() {
         assertEquals(RecordFieldType.STRING.getDataType(), 
DataTypeUtils.getDataTypeFromSQLTypeValue(Types.CLOB));
         
assertEquals(RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.BYTE.getDataType()),
 DataTypeUtils.getDataTypeFromSQLTypeValue(Types.BLOB));
+        assertEquals(RecordFieldType.STRING.getDataType(), 
DataTypeUtils.getDataTypeFromSQLTypeValue(Types.CHAR));
     }
 
     @Test