Skip to content

兼容mysql不同版本int类型处理 fix #19 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhouwm808 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

兼容mysql不同版本int类型处理 fix #19 #21

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f875b91
fix #19 #20
zhouwm808 Jun 1, 2022
b66c539
兼容mysql不同版本int类型字段 fix #19
zhouwm808 Jun 1, 2022
b91f917
把实体类父类字段放在建表的最前面 fix #20
zhouwm808 Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ...a/com/gitee/sunchenbin/mybatis/actable/manager/system/SysMysqlCreateTableManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,15 +433,21 @@ private List<Object> getModifyFieldList(List<SysMysqlColumns> tableColumnList, L
// 3.验证长度个小数点位数
String typeAndLength = createTableParam.getFieldType().toLowerCase();
if (createTableParam.getFileTypeLength() == 1) {
// 拼接出类型加长度，比如varchar(1)
typeAndLength = typeAndLength + "(" + createTableParam.getFieldLength() + ")";
//如果是int类型，mysql5.6及以下版本为int(11)，mysql5.7及以上版本为int，此处兼容处理
if("int".equalsIgnoreCase(typeAndLength) && "int".equalsIgnoreCase(sysColumn.getColumn_type())) {
//只有类型，不需要拼接长度,mysql5.7后int型不能设置长度
} else {
// 拼接出类型加长度，比如varchar(1)
typeAndLength = typeAndLength + "(" + createTableParam.getFieldLength() + ")";
}
} else if (createTableParam.getFileTypeLength() == 2) {
// 拼接出类型加长度，比如varchar(1)
typeAndLength = typeAndLength + "(" + createTableParam.getFieldLength() + ","
+ createTableParam.getFieldDecimalLength() + ")";
}

// 判断类型+长度是否相同

if (!sysColumn.getColumn_type().toLowerCase().equals(typeAndLength)) {
modifyFieldList.add(modifyTableParam);
continue;
Expand Down Expand Up @@ -659,6 +665,8 @@ private Field[] recursionParents(Class<?> clas, Field[] fields) {
if (clas.getSuperclass() != null) {
Class clsSup = clas.getSuperclass();
List<Field> fieldList = new ArrayList<Field>();
//把父类属性字段放到最前面
List<Field> superFieldList = new ArrayList<Field>();
fieldList.addAll(Arrays.asList(fields));
// 获取当前class的所有fields的name列表
List<String> fdNames = getFieldNames(fieldList);
Expand All @@ -669,6 +677,7 @@ private Field[] recursionParents(Class<?> clas, Field[] fields) {
}
fieldList.add(pfd);
}
fieldList.addAll(0, superFieldList);
fields = new Field[fieldList.size()];
int i = 0;
for (Object field : fieldList.toArray()) {
Expand Down