⚡ 数据模型字段comment改名为jdbc_comment以避免数据库关键词

blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/ModelPrototypeController.java

@@ -129,7 +129,7 @@ public class ModelPrototypeController extends BladeController {
 	@ApiOperation(value = "数据原型列表", notes = "数据原型列表")
 	public R<List<ModelPrototype>> select(@ApiParam(value = "数据模型Id", required = true) @RequestParam Long modelId) {
 		List<ModelPrototype> list = modelPrototypeService.list(Wrappers.<ModelPrototype>query().lambda().eq(ModelPrototype::getModelId, modelId));
-		list.forEach(prototype -> prototype.setComment(prototype.getJdbcName() + StringPool.COLON + StringPool.SPACE + prototype.getComment()));
+		list.forEach(prototype -> prototype.setJdbcComment(prototype.getJdbcName() + StringPool.COLON + StringPool.SPACE + prototype.getJdbcComment()));
 		return R.data(list);
 	}
 

blade-ops/blade-develop/src/main/java/org/springblade/develop/entity/ModelPrototype.java

@@ -54,6 +54,11 @@ public class ModelPrototype extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "物理类型")
 	private String jdbcType;
+	/**
+	 * 注释说明
+	 */
+	@ApiModelProperty(value = "注释说明")
+	private String jdbcComment;
 	/**
 	 * 实体列名
 	 */
@@ -69,11 +74,6 @@ public class ModelPrototype extends BaseEntity {
 	 */
 	@ApiModelProperty(value = "实体类型引用")
 	private String propertyEntity;
-	/**
-	 * 注释说明
-	 */
-	@ApiModelProperty(value = "注释说明")
-	private String comment;
 	/**
 	 * 列表显示
 	 */

blade-ops/blade-develop/src/main/java/org/springblade/develop/mapper/ModelPrototypeMapper.xml

@@ -13,7 +13,7 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="jdbc_name" property="jdbcName"/>
         <result column="jdbc_type" property="jdbcType"/>
-        <result column="comment" property="comment"/>
+        <result column="jdbc_comment" property="jdbcComment"/>
         <result column="property_type" property="propertyType"/>
         <result column="property_entity" property="propertyEntity"/>
         <result column="property_name" property="propertyName"/>

doc/sql/db/database-info.md

@@ -250,7 +250,7 @@ Table: blade_model_prototype（数据原型表）
 | model_id       | BIGINT(20)    | YES  |     |         | 模型主键   |
 | jdbc_name      | VARCHAR(50)   | YES  |     |         | 物理列名   |
 | jdbc_type      | VARCHAR(20)   | YES  |     |         | 物理类型   |
-| comment        | VARCHAR(500)  | YES  |     |         | 注释说明   |
+| jdbc_comment   | VARCHAR(500)  | YES  |     |         | 注释说明   |
 | property_type  | VARCHAR(20)   | YES  |     |         | 实体类型   |
 | property_entity| VARCHAR(500)  | YES  |     |         | 实体类型引用|
 | property_name  | VARCHAR(50)   | YES  |     |         | 实体列名   |

doc/sql/mysql/bladex-saber-mysql.sql

@@ -340,7 +340,7 @@ CREATE TABLE `blade_model_prototype`  (
   `model_id` bigint(20) NULL DEFAULT NULL COMMENT '模型主键',
   `jdbc_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物理列名',
   `jdbc_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物理类型',
-  `comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注释说明',
+  `jdbc_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注释说明',
   `property_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体类型',
   `property_entity` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体类型引用',
   `property_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体列名',

doc/sql/mysql/bladex-sword-mysql.sql

@@ -340,7 +340,7 @@ CREATE TABLE `blade_model_prototype`  (
   `model_id` bigint(20) NULL DEFAULT NULL COMMENT '模型主键',
   `jdbc_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物理列名',
   `jdbc_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '物理类型',
-  `comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注释说明',
+  `jdbc_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注释说明',
   `property_type` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体类型',
   `property_entity` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体类型引用',
   `property_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实体列名',

doc/sql/oracle/bladex-saber-oracle.sql

@@ -927,7 +927,7 @@ CREATE TABLE "BLADE_MODEL_PROTOTYPE" (
   "MODEL_ID" NUMBER(20) ,
   "JDBC_NAME" NVARCHAR2(50) ,
   "JDBC_TYPE" NVARCHAR2(20) ,
-  "COMMENT" NVARCHAR2(500) ,
+  "JDBC_COMMENT" NVARCHAR2(500) ,
   "PROPERTY_TYPE" NVARCHAR2(20) ,
   "PROPERTY_ENTITY" NVARCHAR2(500) ,
   "PROPERTY_NAME" NVARCHAR2(50) ,
@@ -963,7 +963,7 @@ COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."ID" IS '主键';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."MODEL_ID" IS '模型主键';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_NAME" IS '物理列名';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_TYPE" IS '物理类型';
-COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."COMMENT" IS '注释说明';
+COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_COMMENT" IS '注释说明';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_TYPE" IS '实体类型';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_ENTITY" IS '实体类型引用';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_NAME" IS '实体列名';

doc/sql/oracle/bladex-sword-oracle.sql

@@ -928,7 +928,7 @@ CREATE TABLE "BLADE_MODEL_PROTOTYPE" (
   "MODEL_ID" NUMBER(20) ,
   "JDBC_NAME" NVARCHAR2(50) ,
   "JDBC_TYPE" NVARCHAR2(20) ,
-  "COMMENT" NVARCHAR2(500) ,
+  "JDBC_COMMENT" NVARCHAR2(500) ,
   "PROPERTY_TYPE" NVARCHAR2(20) ,
   "PROPERTY_ENTITY" NVARCHAR2(500) ,
   "PROPERTY_NAME" NVARCHAR2(50) ,
@@ -964,7 +964,7 @@ COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."ID" IS '主键';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."MODEL_ID" IS '模型主键';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_NAME" IS '物理列名';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_TYPE" IS '物理类型';
-COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."COMMENT" IS '注释说明';
+COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."JDBC_COMMENT" IS '注释说明';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_TYPE" IS '实体类型';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_ENTITY" IS '实体类型引用';
 COMMENT ON COLUMN "BLADE_MODEL_PROTOTYPE"."PROPERTY_NAME" IS '实体列名';

doc/sql/postgresql/bladex-saber-postgresql.sql

@@ -760,7 +760,7 @@ CREATE TABLE "blade_model_prototype" (
   "model_id" int8,
   "jdbc_name" varchar(50) COLLATE "pg_catalog"."default",
   "jdbc_type" varchar(20) COLLATE "pg_catalog"."default",
-  "comment" varchar(500) COLLATE "pg_catalog"."default",
+  "jdbc_comment" varchar(500) COLLATE "pg_catalog"."default",
   "property_type" varchar(20) COLLATE "pg_catalog"."default",
   "property_entity" varchar(500) COLLATE "pg_catalog"."default",
   "property_name" varchar(50) COLLATE "pg_catalog"."default",
@@ -786,7 +786,7 @@ COMMENT ON COLUMN "blade_model_prototype"."id" IS '主键';
 COMMENT ON COLUMN "blade_model_prototype"."model_id" IS '模型主键';
 COMMENT ON COLUMN "blade_model_prototype"."jdbc_name" IS '物理列名';
 COMMENT ON COLUMN "blade_model_prototype"."jdbc_type" IS '物理类型';
-COMMENT ON COLUMN "blade_model_prototype"."comment" IS '注释说明';
+COMMENT ON COLUMN "blade_model_prototype"."jdbc_comment" IS '注释说明';
 COMMENT ON COLUMN "blade_model_prototype"."property_type" IS '实体类型';
 COMMENT ON COLUMN "blade_model_prototype"."property_entity" IS '实体类型引用';
 COMMENT ON COLUMN "blade_model_prototype"."property_name" IS '实体列名';

doc/sql/postgresql/bladex-sword-postgresql.sql

@@ -760,7 +760,7 @@ CREATE TABLE "blade_model_prototype" (
   "model_id" int8,
   "jdbc_name" varchar(50) COLLATE "pg_catalog"."default",
   "jdbc_type" varchar(20) COLLATE "pg_catalog"."default",
-  "comment" varchar(500) COLLATE "pg_catalog"."default",
+  "jdbc_comment" varchar(500) COLLATE "pg_catalog"."default",
   "property_type" varchar(20) COLLATE "pg_catalog"."default",
   "property_entity" varchar(500) COLLATE "pg_catalog"."default",
   "property_name" varchar(50) COLLATE "pg_catalog"."default",
@@ -786,7 +786,7 @@ COMMENT ON COLUMN "blade_model_prototype"."id" IS '主键';
 COMMENT ON COLUMN "blade_model_prototype"."model_id" IS '模型主键';
 COMMENT ON COLUMN "blade_model_prototype"."jdbc_name" IS '物理列名';
 COMMENT ON COLUMN "blade_model_prototype"."jdbc_type" IS '物理类型';
-COMMENT ON COLUMN "blade_model_prototype"."comment" IS '注释说明';
+COMMENT ON COLUMN "blade_model_prototype"."jdbc_comment" IS '注释说明';
 COMMENT ON COLUMN "blade_model_prototype"."property_type" IS '实体类型';
 COMMENT ON COLUMN "blade_model_prototype"."property_entity" IS '实体类型引用';
 COMMENT ON COLUMN "blade_model_prototype"."property_name" IS '实体列名';

doc/sql/sqlserver/bladex-saber-sqlserver.sql

@@ -1808,7 +1808,7 @@ CREATE TABLE [dbo].[blade_model_prototype] (
   [model_id] bigint  NULL,
   [jdbc_name] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
   [jdbc_type] nvarchar(20) COLLATE Chinese_PRC_CI_AS  NULL,
-  [comment] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [jdbc_comment] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_type] nvarchar(20) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_entity] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_name] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
@@ -1866,7 +1866,7 @@ EXEC sp_addextendedproperty
 'MS_Description', N'注释说明',
 'SCHEMA', N'dbo',
 'TABLE', N'blade_model_prototype',
-'COLUMN', N'comment'
+'COLUMN', N'jdbc_comment'
 GO
 
 EXEC sp_addextendedproperty

doc/sql/sqlserver/bladex-sword-sqlserver.sql

@@ -1809,7 +1809,7 @@ CREATE TABLE [dbo].[blade_model_prototype] (
   [model_id] bigint  NULL,
   [jdbc_name] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
   [jdbc_type] nvarchar(20) COLLATE Chinese_PRC_CI_AS  NULL,
-  [comment] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
+  [jdbc_comment] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_type] nvarchar(20) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_entity] nvarchar(500) COLLATE Chinese_PRC_CI_AS  NULL,
   [property_name] nvarchar(50) COLLATE Chinese_PRC_CI_AS  NULL,
@@ -1867,7 +1867,7 @@ EXEC sp_addextendedproperty
 'MS_Description', N'注释说明',
 'SCHEMA', N'dbo',
 'TABLE', N'blade_model_prototype',
-'COLUMN', N'comment'
+'COLUMN', N'jdbc_comment'
 GO
 
 EXEC sp_addextendedproperty

doc/sql/update/bladex-update-3.0.1~3.1.0.sql

@@ -1,4 +0,0 @@
--- -----------------------------------
--- 由于blade-user合并至blade-system，api也发生变化，需要对blade_menu的对应记录修改地址
--- -----------------------------------
-UPDATE blade_menu SET path = REPLACE ( path, 'blade-user', 'blade-system/user' );

doc/sql/update/bladex-update-dameng-3.1.0~3.1.1.sql

@@ -0,0 +1,6 @@
+-- -----------------------------------
+-- 修改 代码生成表字段类型
+-- -----------------------------------
+ALTER TABLE "BLADEX"."BLADE_MODEL_PROTOTYPE" ALTER COLUMN "COMMENT" RENAME TO "JDBC_COMMENT";
+
+COMMENT ON COLUMN "BLADEX"."BLADE_MODEL_PROTOTYPE"."JDBC_COMMENT" IS '注释说明';

doc/sql/update/bladex-update-mysql-3.1.0~3.1.1.sql

@@ -0,0 +1,5 @@
+-- -----------------------------------
+-- 修改 代码生成表字段类型
+-- -----------------------------------
+ALTER TABLE `blade_model_prototype`
+    CHANGE COLUMN `comment` `jdbc_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '注释说明' AFTER `jdbc_type`;

doc/sql/update/bladex-update-oracle-3.1.0~3.1.1.sql

@@ -0,0 +1,5 @@
+-- -----------------------------------
+-- 修改 代码生成表字段类型
+-- -----------------------------------
+ALTER TABLE "BLADEX"."BLADE_MODEL_PROTOTYPE" RENAME COLUMN "COMMENT" TO JDBC_COMMENT;
+COMMENT ON COLUMN "BLADEX"."BLADE_MODEL_PROTOTYPE"."JDBC_COMMENT" IS '注释说明';

doc/sql/update/bladex-update-postgresql-3.1.0~3.1.1.sql

@@ -0,0 +1,5 @@
+-- -----------------------------------
+-- 给代码生成添加字段
+-- -----------------------------------
+ALTER TABLE "blade_model_prototype" RENAME COLUMN "comment" TO "jdbc_comment";
+COMMENT ON COLUMN "blade_model_prototype"."jdbc_comment" IS '注释说明';

doc/sql/update/bladex-update-sqlserver-3.1.0~3.1.1.sql

@@ -0,0 +1,21 @@
+-- -----------------------------------
+-- 修改 代码生成表字段类型
+-- -----------------------------------
+EXEC sp_rename '[dbo].[blade_model_prototype].[comment]', 'jdbc_comment', 'COLUMN'
+GO
+
+IF ((SELECT COUNT(*) FROM ::fn_listextendedproperty('MS_Description',
+'SCHEMA', N'dbo',
+'TABLE', N'blade_model_prototype',
+'COLUMN', N'jdbc_comment')) > 0)
+  EXEC sp_updateextendedproperty
+'MS_Description', N'注释说明',
+'SCHEMA', N'dbo',
+'TABLE', N'blade_model_prototype',
+'COLUMN', N'jdbc_comment'
+ELSE
+  EXEC sp_addextendedproperty
+'MS_Description', N'注释说明',
+'SCHEMA', N'dbo',
+'TABLE', N'blade_model_prototype',
+'COLUMN', N'jdbc_comment';