opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-30 19:22:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Issue:#974 Column reordering not taking effect , unable to modify column name"

Browse Source 
This reverts commit 5802aefdafea52e24aea571f584a46da6b5ccd67.
This commit is contained in:
Suyue
2024-02-04 12:25:49 +08:00
parent 7ae40ab34a
commit 7d7b78df1f
1 changed files with 135 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,10 +8,12 @@ import ai.chat2db.spi.model.Database;
import ai.chat2db.spi.model.Table; import ai.chat2db.spi.model.Table;
import ai.chat2db.spi.model.TableColumn; import ai.chat2db.spi.model.TableColumn;
import ai.chat2db.spi.model.TableIndex; import ai.chat2db.spi.model.TableIndex;
import cn.hutool.core.util.ArrayUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.List; import java.util.Arrays;
import java.util.stream.Collectors; import java.util.HashMap;
import java.util.Map;
public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder { public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
@ -19,14 +21,14 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
public String buildCreateTableSql(Table table) { public String buildCreateTableSql(Table table) {
StringBuilder script = new StringBuilder(); StringBuilder script = new StringBuilder();
script.append("CREATE TABLE "); script.append("CREATE TABLE ");
if(StringUtils.isNotBlank(table.getDatabaseName())) { if (StringUtils.isNotBlank(table.getDatabaseName())) {
script.append("`").append(table.getDatabaseName()).append("`").append("."); script.append("`").append(table.getDatabaseName()).append("`").append(".");
} }
script.append("`").append(table.getName()).append("`").append(" (").append("\n"); script.append("`").append(table.getName()).append("`").append(" (").append("\n");
// append column // append column
for (TableColumn column : table.getColumnList()) { for (TableColumn column : table.getColumnList()) {
if(StringUtils.isBlank(column.getName())|| StringUtils.isBlank(column.getColumnType())){ if (StringUtils.isBlank(column.getName()) || StringUtils.isBlank(column.getColumnType())) {
continue; continue;
} }
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType()); MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
@ -35,7 +37,7 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
// append primary key and index // append primary key and index
for (TableIndex tableIndex : table.getIndexList()) { for (TableIndex tableIndex : table.getIndexList()) {
if(StringUtils.isBlank(tableIndex.getName())|| StringUtils.isBlank(tableIndex.getType())){ if (StringUtils.isBlank(tableIndex.getName()) || StringUtils.isBlank(tableIndex.getType())) {
continue; continue;
} }
MysqlIndexTypeEnum mysqlIndexTypeEnum = MysqlIndexTypeEnum.getByType(tableIndex.getType()); MysqlIndexTypeEnum mysqlIndexTypeEnum = MysqlIndexTypeEnum.getByType(tableIndex.getType());
@ -78,7 +80,7 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
public String buildModifyTaleSql(Table oldTable, Table newTable) { public String buildModifyTaleSql(Table oldTable, Table newTable) {
StringBuilder script = new StringBuilder(); StringBuilder script = new StringBuilder();
script.append("ALTER TABLE "); script.append("ALTER TABLE ");
if(StringUtils.isNotBlank(oldTable.getDatabaseName())) { if (StringUtils.isNotBlank(oldTable.getDatabaseName())) {
script.append("`").append(oldTable.getDatabaseName()).append("`").append("."); script.append("`").append(oldTable.getDatabaseName()).append("`").append(".");
} }
script.append("`").append(oldTable.getName()).append("`").append("\n"); script.append("`").append(oldTable.getName()).append("`").append("\n");
@ -94,7 +96,7 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
// append modify column // append modify column
for (TableColumn tableColumn : newTable.getColumnList()) { for (TableColumn tableColumn : newTable.getColumnList()) {
if (StringUtils.isNotBlank(tableColumn.getEditStatus()) && StringUtils.isNotBlank(tableColumn.getColumnType())&& StringUtils.isNotBlank(tableColumn.getName())){ if (StringUtils.isNotBlank(tableColumn.getEditStatus()) && StringUtils.isNotBlank(tableColumn.getColumnType()) && StringUtils.isNotBlank(tableColumn.getName())) {
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(tableColumn.getColumnType()); MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(tableColumn.getColumnType());
script.append("\t").append(typeEnum.buildModifyColumn(tableColumn)).append(",\n"); script.append("\t").append(typeEnum.buildModifyColumn(tableColumn)).append(",\n");
} }
@ -109,10 +111,10 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
} }
// append reorder column // append reorder column
script.append("\t").append(buildGenerateReorderColumnSql(oldTable, newTable)); script.append(buildGenerateReorderColumnSql(oldTable, newTable));
if(script.length()>2) { if (script.length() > 2) {
script = new StringBuilder(script.substring(0, script.length() - 3)); script = new StringBuilder(script.substring(0, script.length() - 2));
script.append(";"); script.append(";");
} }
@ -120,7 +122,6 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
} }
@Override @Override
public String pageLimit(String sql, int offset, int pageNo, int pageSize) { public String pageLimit(String sql, int offset, int pageNo, int pageSize) {
StringBuilder sqlBuilder = new StringBuilder(sql.length() + 14); StringBuilder sqlBuilder = new StringBuilder(sql.length() + 14);
@ -138,12 +139,10 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
} }
@Override @Override
public String buildCreateDatabaseSql(Database database) { public String buildCreateDatabaseSql(Database database) {
StringBuilder sqlBuilder = new StringBuilder(); StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.append("CREATE DATABASE `"+database.getName()+"`"); sqlBuilder.append("CREATE DATABASE `" + database.getName() + "`");
if (StringUtils.isNotBlank(database.getCharset())) { if (StringUtils.isNotBlank(database.getCharset())) {
sqlBuilder.append(" DEFAULT CHARACTER SET=").append(database.getCharset()); sqlBuilder.append(" DEFAULT CHARACTER SET=").append(database.getCharset());
} }
@ -152,38 +151,143 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder implements SqlBuilder {
} }
return sqlBuilder.toString(); return sqlBuilder.toString();
} }
public String buildGenerateReorderColumnSql(Table oldTable, Table newTable) { public String buildGenerateReorderColumnSql(Table oldTable, Table newTable) {
StringBuilder sql = new StringBuilder(); StringBuilder sql = new StringBuilder();
int n = 0; int n = 0;
for (int i = 0; i < newTable.getColumnList().size(); i++) { // Create a map to store the index of each column in the old table's column list
TableColumn column = newTable.getColumnList().get(i); Map<String, Integer> oldColumnIndexMap = new HashMap<>();
//String columnName = newTable.getColumnList().get(i).getName(); for (int i = 0; i < oldTable.getColumnList().size(); i++) {
// 获取oldTable.getColumnList()中name属性的list oldColumnIndexMap.put(oldTable.getColumnList().get(i).getName(), i);
List<String> oldColumnList = oldTable.getColumnList().stream() }
.map(TableColumn::getName) String[] oldColumnArray = oldTable.getColumnList().stream().map(TableColumn::getName).toArray(String[]::new);
.collect(Collectors.toList()); String[] newColumnArray = newTable.getColumnList().stream().map(TableColumn::getName).toArray(String[]::new);
if (i > oldColumnList.indexOf(column.getOldName())) { buildSql(oldColumnArray, newColumnArray, sql, oldTable, newTable, n);
return sql.toString();
}
private String[] buildSql(String[] originalArray, String[] targetArray, StringBuilder sql, Table oldTable, Table newTable, int n) {
// 先完成首位移动
if (!originalArray[0].equals(targetArray[0])) {
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));
sql.append(" FIRST;\n");
n++;
if (Arrays.equals(newArray, targetArray)) {
return newArray;
}
String[] resultArray = buildSql(newArray, targetArray, sql, oldTable, newTable, n);
if (Arrays.equals(resultArray, targetArray)) {
return resultArray;
}
}
// 在完成最后一位移动
int max = originalArray.length - 1;
if (!originalArray[max].equals(targetArray[max])) {
int a = findIndex(originalArray, targetArray[max]);
//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())) {
sql.append("`").append(oldTable.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(" ");
sql.append(" AFTER ");
sql.append(oldTable.getColumnList().get(max).getName());
sql.append(";\n");
n++;
if (Arrays.equals(newArray, targetArray)) {
return newArray;
}
String[] resultArray = buildSql(newArray, targetArray, sql, oldTable, newTable, n);
if (Arrays.equals(resultArray, targetArray)) {
return resultArray;
}
}
for (int i = 0; i < originalArray.length; i++) {
int a = findIndex(targetArray, originalArray[i]);
if (i != a && isMoveValid(originalArray, targetArray, i, a)) {
// oldTable.getColumnList中查找name为a
int finalI = i;
TableColumn column = oldTable.getColumnList().stream().filter(col -> StringUtils.equals(col.getName(), originalArray[finalI])).findFirst().get();
if (n > 0) { if (n > 0) {
sql.append("ALTER TABLE "); sql.append("ALTER TABLE ");
sql.append("`").append(column.getDatabaseName()).append("`").append("."); if (StringUtils.isNotBlank(oldTable.getDatabaseName())) {
sql.append("`").append(oldTable.getDatabaseName()).append("`").append(".");
}
sql.append("`").append(oldTable.getName()).append("`").append("\n"); sql.append("`").append(oldTable.getName()).append("`").append("\n");
} }
sql.append(" MODIFY COLUMN "); sql.append(" MODIFY COLUMN ");
MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType()); MysqlColumnTypeEnum typeEnum = MysqlColumnTypeEnum.getByType(column.getColumnType());
sql.append(typeEnum.buildColumn(column)); sql.append(typeEnum.buildColumn(column));
sql.append(" "); sql.append(" ");
if (i > 0) { sql.append(" AFTER ");
sql.append(" AFTER "); if (i < a) {
sql.append(newTable.getColumnList().get(i - 1).getName()); sql.append(originalArray[a]);
} else { } else {
sql.append(" FIRST"); sql.append(originalArray[a - 1]);
} }
sql.append(" ;\n");
n++;
}
sql.append(";\n");
n++;
String[] newArray = moveElement(originalArray, i, a);
if (Arrays.equals(newArray, targetArray)) {
return newArray;
}
String[] resultArray = buildSql(newArray, targetArray, sql, oldTable, newTable, n);
if (Arrays.equals(resultArray, targetArray)) {
return resultArray;
}
}
} }
return sql.toString(); return null;
} }
private static int findIndex(String[] array, String element) {
for (int i = 0; i < array.length; i++) {
if (array[i].equals(element)) {
return i;
}
}
return -1;
}
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]));
}
private static String[] moveElement(String[] originalArray, int from, int to) {
String[] newArray = new String[originalArray.length];
System.arraycopy(originalArray, 0, newArray, 0, originalArray.length);
String temp = newArray[from];
if (from < to) {
System.arraycopy(originalArray, from + 1, newArray, from, to - from);
} else {
System.arraycopy(originalArray, to, newArray, to + 1, from - to);
}
newArray[to] = temp;
System.out.println(ArrayUtil.toString(newArray));
return newArray;
}
} }