root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

!108 Infra模块>代码生成器>适配达梦数据库

Browse Source 
Merge pull request !108 from 再见七月/infraBug-by-dm
This commit is contained in:
芋道源码 2024-04-24 01:20:45 +00:00 committed by Gitee
commit ca93a858fd
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
14 changed files with 4 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/dm/ruoyi-vue-pro-dm8.sql
View File

@ -249,7 +249,6 @@ CREATE TABLE "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"
"COLUMN_COMMENT" VARCHAR(500) NOT NULL, "COLUMN_COMMENT" VARCHAR(500) NOT NULL,
"NULLABLE" BIT NOT NULL, "NULLABLE" BIT NOT NULL,
"PRIMARY_KEY" BIT NOT NULL, "PRIMARY_KEY" BIT NOT NULL,
"AUTO_INCREMENT" CHAR(1) NOT NULL,
"ORDINAL_POSITION" INT NOT NULL, "ORDINAL_POSITION" INT NOT NULL,
"JAVA_TYPE" VARCHAR(32) NOT NULL, "JAVA_TYPE" VARCHAR(32) NOT NULL,
"JAVA_FIELD" VARCHAR(64) 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"."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"."ORDINAL_POSITION" IS '排序';
COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';

1
sql/mysql/ruoyi-vue-pro.sql
View File

@ -409,7 +409,6 @@ CREATE TABLE `infra_codegen_column` (
`column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述', `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述',
`nullable` bit(1) NOT NULL COMMENT '是否允许为空', `nullable` bit(1) NOT NULL COMMENT '是否允许为空',
`primary_key` 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 '是否自增',
`ordinal_position` int 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_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 属性名', `java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名',

2
sql/oracle/ruoyi-vue-pro.sql
View File

@ -622,7 +622,6 @@ CREATE TABLE "INFRA_CODEGEN_COLUMN" (
"COLUMN_COMMENT" NVARCHAR2(500), "COLUMN_COMMENT" NVARCHAR2(500),
"NULLABLE" NUMBER(4,0), "NULLABLE" NUMBER(4,0),
"PRIMARY_KEY" NUMBER(4,0), "PRIMARY_KEY" NUMBER(4,0),
"AUTO_INCREMENT" NUMBER(4,0),
"ORDINAL_POSITION" NUMBER(11,0) NOT NULL, "ORDINAL_POSITION" NUMBER(11,0) NOT NULL,
"JAVA_TYPE" NVARCHAR2(32), "JAVA_TYPE" NVARCHAR2(32),
"JAVA_FIELD" NVARCHAR2(64), "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"."COLUMN_COMMENT" IS '字段描述';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" 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"."ORDINAL_POSITION" IS '排序';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型';
COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名';

3
sql/postgresql/ruoyi-vue-pro.sql
View File

@ -1225,7 +1225,6 @@ CREATE TABLE "infra_codegen_column"
"column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL, "column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL,
"nullable" bool NOT NULL, "nullable" bool NOT NULL,
"primary_key" bool NOT NULL, "primary_key" bool NOT NULL,
"auto_increment" bool NOT NULL,
"ordinal_position" int4 NOT NULL, "ordinal_position" int4 NOT NULL,
"java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, "java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL,
"java_field" varchar(64) 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 COMMENT
ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键'; ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键';
COMMENT COMMENT
ON COLUMN "infra_codegen_column"."auto_increment" IS '是否自增';
COMMENT
ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序'; ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序';
COMMENT COMMENT
ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型'; ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型';

8
sql/sqlserver/ruoyi-vue-pro.sql
View File

@ -1957,7 +1957,6 @@ CREATE TABLE [dbo].[infra_codegen_column] (
[column_comment] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, [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, [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, [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, [ordinal_position] int NOT NULL,
[java_type] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS 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, [java_field] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL,
@ -2029,13 +2028,6 @@ EXEC sp_addextendedproperty
'COLUMN', N'primary_key' 'COLUMN', N'primary_key'
GO GO
EXEC sp_addextendedproperty
'MS_Description', N'是否自增',
'SCHEMA', N'dbo',
'TABLE', N'infra_codegen_column',
'COLUMN', N'auto_increment'
GO
EXEC sp_addextendedproperty EXEC sp_addextendedproperty
'MS_Description', N'排序', 'MS_Description', N'排序',
'SCHEMA', N'dbo', 'SCHEMA', N'dbo',

3
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java
View File

@ -30,9 +30,6 @@ public class CodegenColumnRespVO {
@Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false")
private Boolean primaryKey; private Boolean primaryKey;
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
private Boolean autoIncrement;
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer ordinalPosition; private Integer ordinalPosition;

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java
View File

@ -36,10 +36,6 @@ public class CodegenColumnSaveReqVO {
@NotNull(message = "是否主键不能为空") @NotNull(message = "是否主键不能为空")
private Boolean primaryKey; private Boolean primaryKey;
@Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "是否自增不能为空")
private Boolean autoIncrement;
@Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "排序不能为空") @NotNull(message = "排序不能为空")
private Integer ordinalPosition; private Integer ordinalPosition;

1
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java
View File

@ -41,7 +41,6 @@ public interface CodegenConvert {
@Mapping(source = "comment", target = "columnComment"), @Mapping(source = "comment", target = "columnComment"),
@Mapping(source = "metaInfo.nullable", target = "nullable"), @Mapping(source = "metaInfo.nullable", target = "nullable"),
@Mapping(source = "keyFlag", target = "primaryKey"), @Mapping(source = "keyFlag", target = "primaryKey"),
@Mapping(source = "keyIdentityFlag", target = "autoIncrement"),
@Mapping(source = "columnType.type", target = "javaType"), @Mapping(source = "columnType.type", target = "javaType"),
@Mapping(source = "propertyName", target = "javaField"), @Mapping(source = "propertyName", target = "javaField"),
}) })

6
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java
View File

@ -67,12 +67,6 @@ public class CodegenColumnDO extends BaseDO {
* 关联 {@link TableField#isKeyFlag()} * 关联 {@link TableField#isKeyFlag()}
*/ */
private Boolean primaryKey; private Boolean primaryKey;
/**
* 是否自增
*
* 关联 {@link TableField#isKeyIdentityFlag()}
*/
private Boolean autoIncrement;
/** /**
* 排序 * 排序
*/ */

1
yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java
View File

@ -72,7 +72,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest {
assertEquals("编号", column.getColumnComment()); assertEquals("编号", column.getColumnComment());
assertFalse(column.getNullable()); assertFalse(column.getNullable());
assertTrue(column.getPrimaryKey()); assertTrue(column.getPrimaryKey());
assertTrue(column.getAutoIncrement());
assertEquals(1, column.getOrdinalPosition()); assertEquals(1, column.getOrdinalPosition());
assertEquals("Long", column.getJavaType()); assertEquals("Long", column.getJavaType());
assertEquals("id", column.getJavaField()); assertEquals("id", column.getJavaField());

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json
View File

@ -18,7 +18,6 @@
"dataType" : "BIGINT", "dataType" : "BIGINT",
"columnComment" : "编号", "columnComment" : "编号",
"primaryKey" : true, "primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long", "javaType" : "Long",
"javaField" : "id", "javaField" : "id",
"example" : "1024", "example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json
View File

@ -14,7 +14,6 @@
"dataType" : "BIGINT", "dataType" : "BIGINT",
"columnComment" : "编号", "columnComment" : "编号",
"primaryKey" : true, "primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long", "javaType" : "Long",
"javaField" : "id", "javaField" : "id",
"example" : "1024", "example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json
View File

@ -17,7 +17,6 @@
"dataType" : "BIGINT", "dataType" : "BIGINT",
"columnComment" : "编号", "columnComment" : "编号",
"primaryKey" : true, "primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long", "javaType" : "Long",
"javaField" : "id", "javaField" : "id",
"example" : "1024", "example" : "1024",

1
yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json
View File

@ -14,7 +14,6 @@
"dataType" : "BIGINT", "dataType" : "BIGINT",
"columnComment" : "编号", "columnComment" : "编号",
"primaryKey" : true, "primaryKey" : true,
"autoIncrement" : true,
"javaType" : "Long", "javaType" : "Long",
"javaField" : "id", "javaField" : "id",
"example" : "1024", "example" : "1024",