opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-29 18:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1111 from tmlx1990/1107

Browse Source 
fix：1107 修复修改排序后丢失注释的问题
This commit is contained in:
ji
2024-02-17 17:43:19 +08:00
committed by GitHub
parent cb929adb5d 47ce285b23
commit 8a57f0f2ac
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java
View File

@ -178,10 +178,12 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
int a = findIndex(originalArray, targetArray[0]);
TableColumn column = oldTable.getColumnList().stream().filter(col -> StringUtils.equals(col.getName(), originalArray[a])).findFirst().get();
String[] newArray = moveElement(originalArray, a, 0);
System.out.println(ArrayUtil.toString(newArray));
sql.append(" MODIFY COLUMN ");
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
sql.append(typeEnum.buildColumn(column));
if (StringUtils.isNotBlank(column.getComment())) {
sql.append(" COMMENT '").append(column.getComment()).append("'");
}
sql.append(" FIRST;\n");
n++;
if (Arrays.equals(newArray, targetArray)) {
@ -200,7 +202,6 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
//System.out.println("Move " + originalArray[a] + " after " + (a > 0 ? originalArray[max] : "start"));
TableColumn column = oldTable.getColumnList().stream().filter(col -> StringUtils.equals(col.getName(), originalArray[a])).findFirst().get();
String[] newArray = moveElement(originalArray, a, max);
System.out.println(ArrayUtil.toString(newArray));
if (n > 0) {
sql.append("ALTER TABLE ");
if (StringUtils.isNotBlank(oldTable.getDatabaseName())) {
@ -211,7 +212,9 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
sql.append(" MODIFY COLUMN ");
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
sql.append(typeEnum.buildColumn(column));
sql.append(" ");
if (StringUtils.isNotBlank(column.getComment())) {
sql.append(" COMMENT '").append(column.getComment()).append("'");
}
sql.append(" AFTER ");
sql.append(oldTable.getColumnList().get(max).getName());
sql.append(";\n");
@ -242,7 +245,9 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
sql.append(" MODIFY COLUMN ");
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
sql.append(typeEnum.buildColumn(column));
sql.append(" ");
if (StringUtils.isNotBlank(column.getComment())) {
sql.append(" COMMENT '").append(column.getComment()).append("'");
}
sql.append(" AFTER ");
if (i < a) {
sql.append(originalArray[a]);
@ -275,7 +280,6 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
}
private static boolean isMoveValid(String[] originalArray, String[] targetArray, int i, int a) {
System.out.println("i : " + i + " a:" + a);
return (i == 0 || a == 0 || !originalArray[i - 1].equals(targetArray[a - 1])) &&
(i >= originalArray.length - 1 || a >= targetArray.length - 1 || !originalArray[i + 1].equals(targetArray[a + 1]));
}
@ -290,7 +294,6 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
System.arraycopy(originalArray, to, newArray, to + 1, from - to);
}
newArray[to] = temp;
System.out.println(ArrayUtil.toString(newArray));
return newArray;
}