fix: #974 修复MySQL修改列顺序后生成SQL语句错误问题。

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

@@ -10,6 +10,9 @@ import ai.chat2db.spi.model.TableColumn;
 import ai.chat2db.spi.model.TableIndex;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
     @Override
@@ -104,6 +107,10 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
                 script.append("\t").append(mysqlIndexTypeEnum.buildModifyIndex(tableIndex)).append(",\n");
             }
         }
+
+        // append reorder column
+        script.append("\t").append(buildGenerateReorderColumnSql(oldTable, newTable));
+
         if(script.length()>2) {
             script = new StringBuilder(script.substring(0, script.length() - 2));
             script.append(";");
@@ -145,5 +152,38 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
         }
         return sqlBuilder.toString();
     }
+    public String buildGenerateReorderColumnSql(Table oldTable, Table newTable) {
+        StringBuilder sql = new StringBuilder();
+        int n = 0;
+        for (int i = 0; i < newTable.getColumnList().size(); i++) {
+            TableColumn column = newTable.getColumnList().get(i);
+            //String columnName = newTable.getColumnList().get(i).getName();
+            // 获取oldTable.getColumnList()中name属性的list
+            List<String> oldColumnList = oldTable.getColumnList().stream()
+                    .map(TableColumn::getName)
+                    .collect(Collectors.toList());
 
+            if (i > oldColumnList.indexOf(column.getName())) {
+                if (n > 0) {
+                    sql.append("ALTER TABLE ");
+                    sql.append("`").append(column.getDatabaseName()).append("`").append(".");
+                    sql.append("`").append(oldTable.getName()).append("`").append("\n");
+                }
+                sql.append(" MODIFY COLUMN ");
+                MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
+                sql.append(typeEnum.buildColumn(column));
+                sql.append(" ");
+                if (i > 0) {
+                    sql.append(" AFTER ");
+                    sql.append(newTable.getColumnList().get(i - 1).getName());
+                } else {
+                    sql.append(" FIRST");
+                }
+                sql.append(";\n");
+                n++;
+            }
+
+        }
+        return sql.toString();
+    }
 }

chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/type/MysqlColumnTypeEnum.java

@@ -318,6 +318,18 @@ public enum MysqlColumnTypeEnum implements ColumnBuilder {
         return columnType;
     }
 
+    public String buildColumn(TableColumn column) {
+        MysqlColumnTypeEnum type = COLUMN_TYPE_MAP.get(column.getColumnType().toUpperCase());
+        if (type == null) {
+            return "";
+        }
+        StringBuilder script = new StringBuilder();
+
+        script.append("`").append(column.getName()).append("`").append(" ");
+        script.append(buildDataType(column, type)).append(" ");
+        return script.toString();
+    }
+
     private String unsignedDataType(String dataTypeName, String middle) {
         String[] split = dataTypeName.split(" ");
         if (split.length == 2) {