liuxm/screw
1
0
Fork 0
forked from lxm_tools/screw
Code Issues Pull Requests Projects Releases Wiki Activity

🐛 修复数值型列长度问题

Browse Source
This commit is contained in:
SanLi
2020-08-14 10:00:36 +08:00
parent 04a8ab2af9
commit a5458b3c86
2 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
screw-core/src/main/java/cn/smallbun/screw/core/query/mariadb/MariaDbDataBaseQuery.java
View File

@@ -34,6 +34,7 @@ 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;
@@ -95,13 +96,32 @@ 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);
//映射
return Mapping.convertList(resultSet, MariadbColumnModel.class);
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;
} catch (SQLException e) {
throw ExceptionUtils.mpe(e);
} finally {
@@ -167,4 +187,10 @@ 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);
}
}

27
screw-core/src/main/java/cn/smallbun/screw/core/query/mysql/MySqlDataBaseQuery.java
View File

@@ -34,6 +34,7 @@ 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;
@@ -101,13 +102,31 @@ 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);
//映射
return Mapping.convertList(resultSet, MySqlColumnModel.class);
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;
} catch (SQLException e) {
throw ExceptionUtils.mpe(e);
} finally {
@@ -171,4 +190,10 @@ 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);
}
}