Commit fb237fa22e955be3a473c8a255592a91f37a61e9
1 parent
0649c315
【完善】代码生成对 DM 达梦数据的兼容性
Showing
15 changed files
with
0 additions
and
38 deletions
sql/dm/ruoyi-vue-pro-dm8.sql
| ... | ... | @@ -249,7 +249,6 @@ CREATE TABLE "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN" |
| 249 | 249 | "COLUMN_COMMENT" VARCHAR(500) NOT NULL, |
| 250 | 250 | "NULLABLE" BIT NOT NULL, |
| 251 | 251 | "PRIMARY_KEY" BIT NOT NULL, |
| 252 | - "AUTO_INCREMENT" CHAR(1) NOT NULL, | |
| 253 | 252 | "ORDINAL_POSITION" INT NOT NULL, |
| 254 | 253 | "JAVA_TYPE" VARCHAR(32) NOT NULL, |
| 255 | 254 | "JAVA_FIELD" VARCHAR(64) NOT NULL, |
| ... | ... | @@ -2512,8 +2511,6 @@ COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是å¦å… |
| 2512 | 2511 | |
| 2513 | 2512 | COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是å¦ä¸»é”®'; |
| 2514 | 2513 | |
| 2515 | -COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是å¦è‡ªå¢ž'; | |
| 2516 | - | |
| 2517 | 2514 | COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排åº'; |
| 2518 | 2515 | |
| 2519 | 2516 | COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; | ... | ... |
sql/mysql/ruoyi-vue-pro.sql
| ... | ... | @@ -409,7 +409,6 @@ CREATE TABLE `infra_codegen_column` ( |
| 409 | 409 | `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述', |
| 410 | 410 | `nullable` bit(1) NOT NULL COMMENT '是否允许为空', |
| 411 | 411 | `primary_key` bit(1) NOT NULL COMMENT '是否主键', |
| 412 | - `auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增', | |
| 413 | 412 | `ordinal_position` int NOT NULL COMMENT '排序', |
| 414 | 413 | `java_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性类型', |
| 415 | 414 | `java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名', | ... | ... |
sql/oracle/ruoyi-vue-pro.sql
| ... | ... | @@ -622,7 +622,6 @@ CREATE TABLE "INFRA_CODEGEN_COLUMN" ( |
| 622 | 622 | "COLUMN_COMMENT" NVARCHAR2(500), |
| 623 | 623 | "NULLABLE" NUMBER(4,0), |
| 624 | 624 | "PRIMARY_KEY" NUMBER(4,0), |
| 625 | - "AUTO_INCREMENT" NUMBER(4,0), | |
| 626 | 625 | "ORDINAL_POSITION" NUMBER(11,0) NOT NULL, |
| 627 | 626 | "JAVA_TYPE" NVARCHAR2(32), |
| 628 | 627 | "JAVA_FIELD" NVARCHAR2(64), |
| ... | ... | @@ -664,7 +663,6 @@ COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."DATA_TYPE" IS '字段类型'; |
| 664 | 663 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."COLUMN_COMMENT" IS '字段描述'; |
| 665 | 664 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空'; |
| 666 | 665 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键'; |
| 667 | -COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增'; | |
| 668 | 666 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序'; |
| 669 | 667 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; |
| 670 | 668 | COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名'; | ... | ... |
sql/postgresql/ruoyi-vue-pro.sql
| ... | ... | @@ -1225,7 +1225,6 @@ CREATE TABLE "infra_codegen_column" |
| 1225 | 1225 | "column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL, |
| 1226 | 1226 | "nullable" bool NOT NULL, |
| 1227 | 1227 | "primary_key" bool NOT NULL, |
| 1228 | - "auto_increment" bool NOT NULL, | |
| 1229 | 1228 | "ordinal_position" int4 NOT NULL, |
| 1230 | 1229 | "java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, |
| 1231 | 1230 | "java_field" varchar(64) COLLATE "pg_catalog"."default" NOT NULL, |
| ... | ... | @@ -1259,8 +1258,6 @@ ON COLUMN "infra_codegen_column"."nullable" IS '是否允许为空'; |
| 1259 | 1258 | COMMENT |
| 1260 | 1259 | ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键'; |
| 1261 | 1260 | COMMENT |
| 1262 | -ON COLUMN "infra_codegen_column"."auto_increment" IS '是否自增'; | |
| 1263 | -COMMENT | |
| 1264 | 1261 | ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序'; |
| 1265 | 1262 | COMMENT |
| 1266 | 1263 | ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型'; | ... | ... |
sql/sqlserver/ruoyi-vue-pro.sql
| ... | ... | @@ -1957,7 +1957,6 @@ CREATE TABLE [dbo].[infra_codegen_column] ( |
| 1957 | 1957 | [column_comment] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 1958 | 1958 | [nullable] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 1959 | 1959 | [primary_key] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 1960 | - [auto_increment] nchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, | |
| 1961 | 1960 | [ordinal_position] int NOT NULL, |
| 1962 | 1961 | [java_type] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| 1963 | 1962 | [java_field] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, |
| ... | ... | @@ -2030,13 +2029,6 @@ EXEC sp_addextendedproperty |
| 2030 | 2029 | GO |
| 2031 | 2030 | |
| 2032 | 2031 | EXEC sp_addextendedproperty |
| 2033 | -'MS_Description', N'是否自增', | |
| 2034 | -'SCHEMA', N'dbo', | |
| 2035 | -'TABLE', N'infra_codegen_column', | |
| 2036 | -'COLUMN', N'auto_increment' | |
| 2037 | -GO | |
| 2038 | - | |
| 2039 | -EXEC sp_addextendedproperty | |
| 2040 | 2032 | 'MS_Description', N'排序', |
| 2041 | 2033 | 'SCHEMA', N'dbo', |
| 2042 | 2034 | 'TABLE', N'infra_codegen_column', | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java
| ... | ... | @@ -30,9 +30,6 @@ public class CodegenColumnRespVO { |
| 30 | 30 | @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") |
| 31 | 31 | private Boolean primaryKey; |
| 32 | 32 | |
| 33 | - @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") | |
| 34 | - private Boolean autoIncrement; | |
| 35 | - | |
| 36 | 33 | @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") |
| 37 | 34 | private Integer ordinalPosition; |
| 38 | 35 | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java
| ... | ... | @@ -36,10 +36,6 @@ public class CodegenColumnSaveReqVO { |
| 36 | 36 | @NotNull(message = "是否主键不能为空") |
| 37 | 37 | private Boolean primaryKey; |
| 38 | 38 | |
| 39 | - @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") | |
| 40 | - @NotNull(message = "是否自增不能为空") | |
| 41 | - private Boolean autoIncrement; | |
| 42 | - | |
| 43 | 39 | @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") |
| 44 | 40 | @NotNull(message = "排序不能为空") |
| 45 | 41 | private Integer ordinalPosition; | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
| ... | ... | @@ -41,7 +41,6 @@ public interface CodegenConvert { |
| 41 | 41 | @Mapping(source = "comment", target = "columnComment"), |
| 42 | 42 | @Mapping(source = "metaInfo.nullable", target = "nullable"), |
| 43 | 43 | @Mapping(source = "keyFlag", target = "primaryKey"), |
| 44 | - @Mapping(source = "keyIdentityFlag", target = "autoIncrement"), | |
| 45 | 44 | @Mapping(source = "columnType.type", target = "javaType"), |
| 46 | 45 | @Mapping(source = "propertyName", target = "javaField"), |
| 47 | 46 | }) | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
| ... | ... | @@ -68,12 +68,6 @@ public class CodegenColumnDO extends BaseDO { |
| 68 | 68 | */ |
| 69 | 69 | private Boolean primaryKey; |
| 70 | 70 | /** |
| 71 | - * 是否自增 | |
| 72 | - * | |
| 73 | - * 关联 {@link TableField#isKeyIdentityFlag()} | |
| 74 | - */ | |
| 75 | - private Boolean autoIncrement; | |
| 76 | - /** | |
| 77 | 71 | * 排序 |
| 78 | 72 | */ |
| 79 | 73 | private Integer ordinalPosition; | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java
| ... | ... | @@ -54,7 +54,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest { |
| 54 | 54 | when(metaInfo.getJdbcType()).thenReturn(JdbcType.BIGINT); |
| 55 | 55 | when(tableField.getComment()).thenReturn("编号"); |
| 56 | 56 | when(tableField.isKeyFlag()).thenReturn(true); |
| 57 | - when(tableField.isKeyIdentityFlag()).thenReturn(true); | |
| 58 | 57 | IColumnType columnType = mock(IColumnType.class); |
| 59 | 58 | when(tableField.getColumnType()).thenReturn(columnType); |
| 60 | 59 | when(columnType.getType()).thenReturn("Long"); |
| ... | ... | @@ -72,7 +71,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest { |
| 72 | 71 | assertEquals("编号", column.getColumnComment()); |
| 73 | 72 | assertFalse(column.getNullable()); |
| 74 | 73 | assertTrue(column.getPrimaryKey()); |
| 75 | - assertTrue(column.getAutoIncrement()); | |
| 76 | 74 | assertEquals(1, column.getOrdinalPosition()); |
| 77 | 75 | assertEquals("Long", column.getJavaType()); |
| 78 | 76 | assertEquals("id", column.getJavaField()); | ... | ... |
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json
yudao-module-infra/yudao-module-infra-biz/src/test/resources/sql/create_tables.sql
| ... | ... | @@ -196,7 +196,6 @@ CREATE TABLE IF NOT EXISTS "infra_codegen_column" ( |
| 196 | 196 | "column_comment" varchar(500) NOT NULL, |
| 197 | 197 | "nullable" tinyint not null, |
| 198 | 198 | "primary_key" tinyint not null, |
| 199 | - "auto_increment" varchar(5) not null, | |
| 200 | 199 | "ordinal_position" int not null, |
| 201 | 200 | "java_type" varchar(32) NOT NULL, |
| 202 | 201 | "java_field" varchar(64) NOT NULL, | ... | ... |