From 3bfea32052416121ae2c02c181e86f4abd38030f Mon Sep 17 00:00:00 2001 From: liuliu Date: Fri, 20 May 2022 16:15:59 +0800 Subject: [PATCH] [hotfix-435][jdbc]jdbc numberType contain all numeric type --- .../com/dtstack/chunjun/enums/ColumnType.java | 71 ++++++++++++++++--- 1 file changed, 63 insertions(+), 8 deletions(-) diff --git a/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java index 2e4a212815..ef1f9511b4 100644 --- a/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java @@ -52,41 +52,96 @@ public enum ColumnType { INT2, INT4, INT8, + INT16, + INT24, INT32, + INT64, + UINT16, + UINT32, + UINT64, + SERIAL, + SERIAL8, + SMALLSERIAL, + BIGSERIAL, + DEC, + REAL, MEDIUMINT, TINYINT, DATETIME, SMALLINT, BIGINT, LONG, - INT64, SHORT, INTEGER, NUMBER, NUMERIC, + MONEY, + OID, + DECIMAL, + BIGDECIMAL, /** double type */ DOUBLE, FLOAT, + FLOAT4, + FLOAT8, + FLOAT32, + FLOAT64, + SMALLFLOAT, + DECFLOAT, BOOLEAN, + PRECISION, + DOUBLEPRECISION, /** date type */ DATE, TIMESTAMP, TIME, - DECIMAL, YEAR, BIT, - OBJECT, - /** for postgresql */ - TIMESTAMPTZ; + OBJECT; public static List TIME_TYPE = Arrays.asList(DATE, DATETIME, TIME, TIMESTAMP); public static List NUMBER_TYPE = Arrays.asList( - INT, INTEGER, MEDIUMINT, TINYINT, SMALLINT, BIGINT, LONG, SHORT, DOUBLE, FLOAT, - DECIMAL, NUMBER); + INT, + INT16, + INT24, + INT32, + INT64, + UINT16, + UINT32, + UINT64, + SERIAL, + SERIAL8, + SMALLSERIAL, + BIGSERIAL, + DEC, + REAL, + MONEY, + OID, + DECIMAL, + BIGDECIMAL, + INTEGER, + MEDIUMINT, + TINYINT, + SMALLINT, + BIGINT, + LONG, + SHORT, + DOUBLE, + FLOAT, + FLOAT4, + FLOAT8, + FLOAT32, + FLOAT64, + SMALLFLOAT, + DECFLOAT, + DECIMAL, + NUMBER, + PRECISION, + DOUBLEPRECISION); public static List STRING_TYPE = Arrays.asList(STRING, VARCHAR, VARCHAR2, CHAR, NVARCHAR, TEXT, KEYWORD, BINARY); @@ -149,7 +204,7 @@ public static boolean isTimeType(String type) { } public static boolean isNumberType(String type) { - return NUMBER_TYPE.contains(getType(type)); + return NUMBER_TYPE.contains(getType(type.replaceAll(" ", ""))); } public static boolean isStringType(String type) {