From b251dd6e757bd7d7dad0304224bd3918d8caad95 Mon Sep 17 00:00:00 2001 From: tmlx1990 Date: Fri, 31 May 2024 15:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8=E5=88=97?= =?UTF-8?q?=E5=88=B0=E5=88=A0=E9=99=A4=E5=88=97=E5=90=8E=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chat2db/plugin/mysql/builder/MysqlSqlBuilder.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java index dd18f28d..06567bdf 100644 --- a/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java +++ b/chat2db-server/chat2db-plugins/chat2db-mysql/src/main/java/ai/chat2db/plugin/mysql/builder/MysqlSqlBuilder.java @@ -2,13 +2,12 @@ package ai.chat2db.plugin.mysql.builder; import ai.chat2db.plugin.mysql.type.MysqlColumnTypeEnum; import ai.chat2db.plugin.mysql.type.MysqlIndexTypeEnum; -import ai.chat2db.spi.SqlBuilder; +import ai.chat2db.spi.enums.EditStatus; import ai.chat2db.spi.jdbc.DefaultSqlBuilder; import ai.chat2db.spi.model.Database; import ai.chat2db.spi.model.Table; import ai.chat2db.spi.model.TableColumn; import ai.chat2db.spi.model.TableIndex; -import cn.hutool.core.util.ArrayUtil; import org.apache.commons.lang3.StringUtils; import java.util.*; @@ -145,7 +144,13 @@ public class MysqlSqlBuilder extends DefaultSqlBuilder { if (index == 0) { return "-1"; } - return newTable.getColumnList().get(index - 1).getName(); + // Find the previous column that is not deleted + for (int i = index - 1; i >= 0; i--) { + if (newTable.getColumnList().get(i).getEditStatus() == null || !newTable.getColumnList().get(i).getEditStatus().equals(EditStatus.DELETE.name())) { + return newTable.getColumnList().get(i).getName(); + } + } + return "-1"; } @Override