redmine 31620 增加对unsigned类型支持

Author: yanghuaiGit

flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java

@@ -39,7 +39,7 @@ public class ConstantValue {
     public static final String RIGHT_PARENTHESIS_SYMBOL = ")";
 
 
-    public static final String DATA_TYPE_UNSIGNED = "unsigned";
+    public static final String DATA_TYPE_UNSIGNED = "UNSIGNED";
 
 
     public static final String KEY_HTTP = "http";

flinkx-core/src/main/java/com/dtstack/flinkx/enums/ColumnType.java

@@ -23,6 +23,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Define standard column type for all the readers or writers that do not
@@ -82,11 +83,12 @@ public static ColumnType fromString(String type) {
             type = type.substring(0, type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL));
         }
 
+        type =  type.toUpperCase(Locale.ENGLISH);
         //为了支持无符号类型  如 int unsigned
-        if(StringUtils.containsIgnoreCase(type,ConstantValue.DATA_TYPE_UNSIGNED)){
-            type = type.replaceAll(ConstantValue.DATA_TYPE_UNSIGNED,"").trim();
+        if(StringUtils.contains(type,ConstantValue.DATA_TYPE_UNSIGNED)){
+            type = type.replace(ConstantValue.DATA_TYPE_UNSIGNED,"").trim();
         }
-        return valueOf(type.toUpperCase());
+        return valueOf(type);
     }
 
     /**
@@ -95,16 +97,17 @@ public static ColumnType fromString(String type) {
      * @return
      */
     public static ColumnType getType(String type){
+        type = type.toUpperCase(Locale.ENGLISH);
         if(type.contains(ConstantValue.LEFT_PARENTHESIS_SYMBOL)){
             type = type.substring(0, type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL));
         }
 
         //为了支持无符号类型  如 int unsigned
-        if(StringUtils.containsIgnoreCase(type,ConstantValue.DATA_TYPE_UNSIGNED)){
+        if(StringUtils.contains(type,ConstantValue.DATA_TYPE_UNSIGNED)){
             type = type.replaceAll(ConstantValue.DATA_TYPE_UNSIGNED,"").trim();
         }
 
-        if(type.toLowerCase().contains(ColumnType.TIMESTAMP.name().toLowerCase())){
+        if(type.contains(ColumnType.TIMESTAMP.name())){
             return TIMESTAMP;
         }