From bb924620c08ee93fa90ddd5d590e7dc3304989ed Mon Sep 17 00:00:00 2001
From: SanLi <2689170096@qq.com>
Date: Thu, 20 Aug 2020 10:59:30 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../query/mariadb/MariaDbDataBaseQuery.java   | 28 +------------------
 .../core/query/mysql/MySqlDataBaseQuery.java  | 27 +-----------------
 2 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java b/screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java
index 79660f3..70dcbae 100644
--- a/screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java
+++ b/screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java
@@ -34,7 +34,6 @@ import cn.smallbun.screw.core.util.JdbcUtils;
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.List;
 
 import static cn.smallbun.screw.core.constant.DefaultConstants.PERCENT_SIGN;
@@ -96,32 +95,13 @@ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery {
      */
     @Override
     public List<MariadbColumnModel> getTableColumns(String table) throws QueryException {
-        String unsigned = "UNSIGNED";
         Assert.notEmpty(table, "Table name can not be empty!");
         ResultSet resultSet = null;
         try {
             //查询
             resultSet = getMetaData().getColumns(getCatalog(), getSchema(), table, PERCENT_SIGN);
             //映射
-            List<MariadbColumnModel> list = Mapping.convertList(resultSet,
-                MariadbColumnModel.class);
-            //处理长度问题
-            for (MariadbColumnModel model : list) {
-                // 字段类型
-                String dbType = model.getTypeName();
-                if (dbType.contains(unsigned)) {
-                    // 无符号
-                    model.setTypeName(dbType.replace(" UNSIGNED", ""));
-                } else {
-                    // 有符号
-                    if (isNumberType(dbType)) {
-                        // 数字类型
-                        model.setColumnSize(
-                            String.valueOf(Integer.parseInt(model.getColumnSize()) + 1));
-                    }
-                }
-            }
-            return list;
+            return Mapping.convertList(resultSet, MariadbColumnModel.class);
         } catch (SQLException e) {
             throw ExceptionUtils.mpe(e);
         } finally {
@@ -187,10 +167,4 @@ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery {
             JdbcUtils.close(resultSet);
         }
     }
-
-    protected static boolean isNumberType(String dbType) {
-        String[] arr = { "NUMERIC", "DECIMAL", "TINYINT", "SMALLINT", "INTEGER", "BIGINT", "REAL",
-                         "FLOAT", "DOUBLE" };
-        return Arrays.asList(arr).contains(dbType);
-    }
 }
diff --git a/screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java b/screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java
index 4622a8d..0ba6c81 100644
--- a/screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java
+++ b/screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java
@@ -34,7 +34,6 @@ import cn.smallbun.screw.core.util.JdbcUtils;
 import javax.sql.DataSource;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Arrays;
 import java.util.List;
 
 import static cn.smallbun.screw.core.constant.DefaultConstants.PERCENT_SIGN;
@@ -102,31 +101,13 @@ public class MySqlDataBaseQuery extends AbstractDatabaseQuery {
      */
     @Override
     public List<MySqlColumnModel> getTableColumns(String table) throws QueryException {
-        String unsigned = "UNSIGNED";
         Assert.notEmpty(table, "Table name can not be empty!");
         ResultSet resultSet = null;
         try {
             //查询
             resultSet = getMetaData().getColumns(getCatalog(), getSchema(), table, PERCENT_SIGN);
             //映射
-            List<MySqlColumnModel> list = Mapping.convertList(resultSet, MySqlColumnModel.class);
-            //处理长度问题
-            for (MySqlColumnModel model : list) {
-                // 字段类型
-                String dbType = model.getTypeName();
-                if (dbType.contains(unsigned)) {
-                    // 无符号
-                    model.setTypeName(dbType.replace(" UNSIGNED", ""));
-                } else {
-                    // 有符号
-                    if (isNumberType(dbType)) {
-                        // 数字类型
-                        model.setColumnSize(
-                            String.valueOf(Integer.parseInt(model.getColumnSize()) + 1));
-                    }
-                }
-            }
-            return list;
+            return Mapping.convertList(resultSet, MySqlColumnModel.class);
         } catch (SQLException e) {
             throw ExceptionUtils.mpe(e);
         } finally {
@@ -190,10 +171,4 @@ public class MySqlDataBaseQuery extends AbstractDatabaseQuery {
             JdbcUtils.close(resultSet);
         }
     }
-
-    protected static boolean isNumberType(String dbType) {
-        String[] arr = { "NUMERIC", "DECIMAL", "TINYINT", "SMALLINT", "INTEGER", "BIGINT", "REAL",
-                         "FLOAT", "DOUBLE" };
-        return Arrays.asList(arr).contains(dbType);
-    }
 }
\ No newline at end of file