修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因: 调整策略:删除-> autoIncrement <-字段
This commit is contained in:
parent
e2c1c7d380
commit
4e10a0c2ef
@ -249,7 +249,6 @@ CREATE TABLE "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"
|
||||
"COLUMN_COMMENT" VARCHAR(500) NOT NULL,
|
||||
"NULLABLE" BIT NOT NULL,
|
||||
"PRIMARY_KEY" BIT NOT NULL,
|
||||
"AUTO_INCREMENT" CHAR(1) NOT NULL,
|
||||
"ORDINAL_POSITION" INT NOT NULL,
|
||||
"JAVA_TYPE" VARCHAR(32) NOT NULL,
|
||||
"JAVA_FIELD" VARCHAR(64) NOT NULL,
|
||||
@ -2512,8 +2511,6 @@ COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否
|
||||
|
||||
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键';
|
||||
|
||||
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增';
|
||||
|
||||
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序';
|
||||
|
||||
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';
|
||||
|
@ -409,7 +409,7 @@ CREATE TABLE `infra_codegen_column` (
|
||||
`column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述',
|
||||
`nullable` bit(1) NOT NULL COMMENT '是否允许为空',
|
||||
`primary_key` bit(1) NOT NULL COMMENT '是否主键',
|
||||
`auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增',
|
||||
`is_auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增',
|
||||
`ordinal_position` int NOT NULL COMMENT '排序',
|
||||
`java_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性类型',
|
||||
`java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名',
|
||||
|
@ -622,7 +622,6 @@ CREATE TABLE "INFRA_CODEGEN_COLUMN" (
|
||||
"COLUMN_COMMENT" NVARCHAR2(500),
|
||||
"NULLABLE" NUMBER(4,0),
|
||||
"PRIMARY_KEY" NUMBER(4,0),
|
||||
"AUTO_INCREMENT" NUMBER(4,0),
|
||||
"ORDINAL_POSITION" NUMBER(11,0) NOT NULL,
|
||||
"JAVA_TYPE" NVARCHAR2(32),
|
||||
"JAVA_FIELD" NVARCHAR2(64),
|
||||
@ -664,7 +663,6 @@ COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."DATA_TYPE" IS '字段类型';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."COLUMN_COMMENT" IS '字段描述';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';
|
||||
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名';
|
||||
|
@ -1225,7 +1225,6 @@ CREATE TABLE "infra_codegen_column"
|
||||
"column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL,
|
||||
"nullable" bool NOT NULL,
|
||||
"primary_key" bool NOT NULL,
|
||||
"auto_increment" bool NOT NULL,
|
||||
"ordinal_position" int4 NOT NULL,
|
||||
"java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
|
||||
"java_field" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
|
||||
@ -1259,8 +1258,6 @@ ON COLUMN "infra_codegen_column"."nullable" IS '是否允许为空';
|
||||
COMMENT
|
||||
ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键';
|
||||
COMMENT
|
||||
ON COLUMN "infra_codegen_column"."auto_increment" IS '是否自增';
|
||||
COMMENT
|
||||
ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序';
|
||||
COMMENT
|
||||
ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型';
|
||||
|
@ -1957,7 +1957,6 @@ CREATE TABLE [dbo].[infra_codegen_column] (
|
||||
[column_comment] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
[nullable] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
[primary_key] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
[auto_increment] nchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
[ordinal_position] int NOT NULL,
|
||||
[java_type] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
[java_field] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
|
||||
@ -2029,13 +2028,6 @@ EXEC sp_addextendedproperty
|
||||
'COLUMN', N'primary_key'
|
||||
GO
|
||||
|
||||
EXEC sp_addextendedproperty
|
||||
'MS_Description', N'是否自增',
|
||||
'SCHEMA', N'dbo',
|
||||
'TABLE', N'infra_codegen_column',
|
||||
'COLUMN', N'auto_increment'
|
||||
GO
|
||||
|
||||
EXEC sp_addextendedproperty
|
||||
'MS_Description', N'排序',
|
||||
'SCHEMA', N'dbo',
|
||||
|
@ -30,9 +30,6 @@ public class CodegenColumnRespVO {
|
||||
@Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
|
||||
private Boolean primaryKey;
|
||||
|
||||
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
|
||||
private Boolean autoIncrement;
|
||||
|
||||
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||
private Integer ordinalPosition;
|
||||
|
||||
|
@ -36,10 +36,6 @@ public class CodegenColumnSaveReqVO {
|
||||
@NotNull(message = "是否主键不能为空")
|
||||
private Boolean primaryKey;
|
||||
|
||||
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
|
||||
@NotNull(message = "是否自增不能为空")
|
||||
private Boolean autoIncrement;
|
||||
|
||||
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
|
||||
@NotNull(message = "排序不能为空")
|
||||
private Integer ordinalPosition;
|
||||
|
@ -41,7 +41,6 @@ public interface CodegenConvert {
|
||||
@Mapping(source = "comment", target = "columnComment"),
|
||||
@Mapping(source = "metaInfo.nullable", target = "nullable"),
|
||||
@Mapping(source = "keyFlag", target = "primaryKey"),
|
||||
@Mapping(source = "keyIdentityFlag", target = "autoIncrement"),
|
||||
@Mapping(source = "columnType.type", target = "javaType"),
|
||||
@Mapping(source = "propertyName", target = "javaField"),
|
||||
})
|
||||
|
@ -67,12 +67,6 @@ public class CodegenColumnDO extends BaseDO {
|
||||
* 关联 {@link TableField#isKeyFlag()}
|
||||
*/
|
||||
private Boolean primaryKey;
|
||||
/**
|
||||
* 是否自增
|
||||
*
|
||||
* 关联 {@link TableField#isKeyIdentityFlag()}
|
||||
*/
|
||||
private Boolean autoIncrement;
|
||||
/**
|
||||
* 排序
|
||||
*/
|
||||
|
@ -72,7 +72,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest {
|
||||
assertEquals("编号", column.getColumnComment());
|
||||
assertFalse(column.getNullable());
|
||||
assertTrue(column.getPrimaryKey());
|
||||
assertTrue(column.getAutoIncrement());
|
||||
assertEquals(1, column.getOrdinalPosition());
|
||||
assertEquals("Long", column.getJavaType());
|
||||
assertEquals("id", column.getJavaField());
|
||||
|
@ -18,7 +18,6 @@
|
||||
"dataType" : "BIGINT",
|
||||
"columnComment" : "编号",
|
||||
"primaryKey" : true,
|
||||
"autoIncrement" : true,
|
||||
"javaType" : "Long",
|
||||
"javaField" : "id",
|
||||
"example" : "1024",
|
||||
@ -50,4 +49,4 @@
|
||||
"updateOperation" : true,
|
||||
"listOperationResult" : true
|
||||
} ]
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,6 @@
|
||||
"dataType" : "BIGINT",
|
||||
"columnComment" : "编号",
|
||||
"primaryKey" : true,
|
||||
"autoIncrement" : true,
|
||||
"javaType" : "Long",
|
||||
"javaField" : "id",
|
||||
"example" : "1024",
|
||||
@ -141,4 +140,4 @@
|
||||
"listOperationResult" : true,
|
||||
"htmlType" : "datetime"
|
||||
} ]
|
||||
}
|
||||
}
|
||||
|
@ -17,7 +17,6 @@
|
||||
"dataType" : "BIGINT",
|
||||
"columnComment" : "编号",
|
||||
"primaryKey" : true,
|
||||
"autoIncrement" : true,
|
||||
"javaType" : "Long",
|
||||
"javaField" : "id",
|
||||
"example" : "1024",
|
||||
@ -132,4 +131,4 @@
|
||||
"listOperationResult" : true,
|
||||
"htmlType" : "datetime"
|
||||
} ]
|
||||
}
|
||||
}
|
||||
|
@ -14,7 +14,6 @@
|
||||
"dataType" : "BIGINT",
|
||||
"columnComment" : "编号",
|
||||
"primaryKey" : true,
|
||||
"autoIncrement" : true,
|
||||
"javaType" : "Long",
|
||||
"javaField" : "id",
|
||||
"example" : "1024",
|
||||
@ -141,4 +140,4 @@
|
||||
"listOperationResult" : true,
|
||||
"htmlType" : "datetime"
|
||||
} ]
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user