From 405472a9b2c512cf13b3153cd24e9fb6ca3f2ad3 Mon Sep 17 00:00:00 2001 From: ruying408 <1877972603@qq.com> Date: Sat, 13 Sep 2025 00:44:42 +0800 Subject: [PATCH] =?UTF-8?q?upgrade:=201=E3=80=81=E5=8D=87=E7=BA=A7autotabl?= =?UTF-8?q?e=E3=80=81mybatisflex=20=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=202=E3=80=81=E7=A7=BB=E9=99=A4=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E5=AE=9E=E4=BD=93=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pgsql/builder/ColumnSqlBuilder.java | 53 ------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/main/java/org/dromara/autotable/core/strategy/pgsql/builder/ColumnSqlBuilder.java diff --git a/src/main/java/org/dromara/autotable/core/strategy/pgsql/builder/ColumnSqlBuilder.java b/src/main/java/org/dromara/autotable/core/strategy/pgsql/builder/ColumnSqlBuilder.java deleted file mode 100644 index 97f545c..0000000 --- a/src/main/java/org/dromara/autotable/core/strategy/pgsql/builder/ColumnSqlBuilder.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.dromara.autotable.core.strategy.pgsql.builder; - -import org.dromara.autotable.annotation.enums.DefaultValueEnum; -import org.dromara.autotable.core.strategy.ColumnMetadata; -import org.dromara.autotable.core.utils.StringConnectHelper; -import org.dromara.autotable.core.utils.StringUtils; - -/** - * 列相关的SQL生成器 - * 覆盖原始的ColumnSqlBuilder GENERATED ALWAYS AS IDENTITY 改为 GENERATED BY DEFAULT AS IDENTITY - * 已提issues https://gitee.com/dromara/auto-table/issues/IC6TR5 - */ -public class ColumnSqlBuilder { - - /** - * 生成字段相关的SQL片段 - * - * @param columnMetadata 列元数据 - * @return 列相关的sql - */ - public static String buildSql(ColumnMetadata columnMetadata) { - // 例子："name" varchar(100) NULL DEFAULT '张三' COMMENT '名称' - // 例子："id" int4(32) NOT NULL AUTO_INCREMENT COMMENT '主键' - StringConnectHelper sql = StringConnectHelper.newInstance("{columnName} {typeAndLength} {null} {default}") - .replace("{columnName}", columnMetadata.getName()) - .replace("{typeAndLength}", () -> columnMetadata.getType().getDefaultFullType()); - - // 如果是自增列，则使用GENERATED ALWAYS AS IDENTITY, 忽略not null和默认值的配置 - if (columnMetadata.isAutoIncrement()) { - return sql.replace("{null} {default}", "GENERATED BY DEFAULT AS IDENTITY").toString(); - } - - return sql.replace("{null}", columnMetadata.isNotNull() ? "NOT NULL" : "") - .replace("{default}", () -> { - // 指定NULL - DefaultValueEnum defaultValueType = columnMetadata.getDefaultValueType(); - if (defaultValueType == DefaultValueEnum.NULL) { - return "DEFAULT NULL"; - } - // 指定空字符串 - if (defaultValueType == DefaultValueEnum.EMPTY_STRING) { - return "DEFAULT ''"; - } - // 自定义 - String defaultValue = columnMetadata.getDefaultValue(); - if (DefaultValueEnum.isCustom(defaultValueType) && StringUtils.hasText(defaultValue)) { - return "DEFAULT " + defaultValue; - } - return ""; - }) - .toString(); - } -}