From 8a3a793cbee9459f92816ad9057c5f32558f6a61 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 24 Nov 2021 16:21:49 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B4=E7=90=86=20sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V14__area_code.sql | 12 +-- .../db/migration/V15__update_function.sql | 4 +- .../db/migration/V17__update_auth.sql | 2 +- .../resources/db/migration/V18__add_demo.sql | 3 - .../db/migration/V19__area_mapping.sql | 23 +++--- .../db/migration/V20__linkage_table.sql | 1 - .../db/migration/V22__record_auth_view.sql | 2 +- .../db/migration/V24__new_demo_panel.sql | 3 - .../resources/db/migration/V27__de1.4.sql | 6 +- .../resources/db/migration/V28__de1.5.sql | 6 +- .../db/migration/V2__dataease_ddl.sql | 2 +- .../main/resources/db/migration/V5__auth.sql | 74 +++++++++++-------- .../db/migration/V9__chart_view_copy.sql | 2 +- 13 files changed, 71 insertions(+), 69 deletions(-) diff --git a/backend/src/main/resources/db/migration/V14__area_code.sql b/backend/src/main/resources/db/migration/V14__area_code.sql index 48ac015a0f..b2ab5284a2 100644 --- a/backend/src/main/resources/db/migration/V14__area_code.sql +++ b/backend/src/main/resources/db/migration/V14__area_code.sql @@ -1,10 +1,10 @@ CREATE TABLE `area_mapping` ( `id` bigint(20) NOT NULL COMMENT 'id', - `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称', - `province_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省代码', - `city_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市名称', - `city_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市代码', - `county_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县名称', - `county_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县代码', + `province_name` varchar(255) NULL DEFAULT NULL COMMENT '省名称', + `province_code` varchar(255) NULL DEFAULT NULL COMMENT '省代码', + `city_name` varchar(255) NULL DEFAULT NULL COMMENT '市名称', + `city_code` varchar(255) NULL DEFAULT NULL COMMENT '市代码', + `county_name` varchar(255) NULL DEFAULT NULL COMMENT '县名称', + `county_code` varchar(255) NULL DEFAULT NULL COMMENT '县代码', PRIMARY KEY (`id`) USING BTREE ) ; diff --git a/backend/src/main/resources/db/migration/V15__update_function.sql b/backend/src/main/resources/db/migration/V15__update_function.sql index 9889fee7ae..f28684638f 100644 --- a/backend/src/main/resources/db/migration/V15__update_function.sql +++ b/backend/src/main/resources/db/migration/V15__update_function.sql @@ -1,6 +1,6 @@ DROP FUNCTION IF EXISTS `GET_CHART_VIEW_COPY_NAME`; delimiter ;; -CREATE FUNCTION `GET_CHART_VIEW_COPY_NAME`(chartId varchar(255)) RETURNS varchar(255) CHARSET utf8 +CREATE FUNCTION `GET_CHART_VIEW_COPY_NAME`(chartId varchar(255)) RETURNS varchar(255) READS SQL DATA BEGIN @@ -30,4 +30,4 @@ END delimiter ; DROP VIEW IF EXISTS `v_auth_model`; -CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS select `sys_user`.`user_id` AS `id`,`sys_user`.`username` AS `name`,`sys_user`.`username` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'user' AS `model_type`,'user' AS `model_inner_type`,'target' AS `auth_type`,`sys_user`.`create_by` AS `create_by` from `sys_user` union all select `sys_role`.`role_id` AS `id`,`sys_role`.`name` AS `name`,`sys_role`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'role' AS `model_type`,'role' AS `model_inner_type`,'target' AS `auth_type`,`sys_role`.`create_by` AS `create_by` from `sys_role` union all select `sys_dept`.`dept_id` AS `id`,`sys_dept`.`name` AS `name`,`sys_dept`.`name` AS `lable`,cast(`sys_dept`.`pid` as char charset utf8mb4) AS `pid`,if((`sys_dept`.`sub_count` = 0),'leaf','spine') AS `node_type`,'dept' AS `model_type`,'dept' AS `model_inner_type`,'target' AS `auth_type`,`sys_dept`.`create_by` AS `create_by` from `sys_dept` union all select `datasource`.`id` AS `id`,`datasource`.`name` AS `NAME`,`datasource`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'link' AS `model_type`,`datasource`.`type` AS `model_inner_type`,'source' AS `auth_type`,`datasource`.`create_by` AS `create_by` from `datasource` union all select `dataset_group`.`id` AS `id`,`dataset_group`.`name` AS `NAME`,`dataset_group`.`name` AS `lable`,if(isnull(`dataset_group`.`pid`),'0',`dataset_group`.`pid`) AS `pid`,'spine' AS `node_type`,'dataset' AS `model_type`,`dataset_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_group`.`create_by` AS `create_by` from `dataset_group` union all select `dataset_table`.`id` AS `id`,`dataset_table`.`name` AS `NAME`,`dataset_table`.`name` AS `lable`,`dataset_table`.`scene_id` AS `pid`,'leaf' AS `node_type`,'dataset' AS `model_type`,`dataset_table`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_table`.`create_by` AS `create_by` from `dataset_table` union all select `chart_group`.`id` AS `id`,`chart_group`.`name` AS `name`,`chart_group`.`name` AS `label`,if(isnull(`chart_group`.`pid`),'0',`chart_group`.`pid`) AS `pid`,'spine' AS `node_type`,'chart' AS `model_type`,`chart_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_group`.`create_by` AS `create_by` from `chart_group` union all select `chart_view`.`id` AS `id`,`chart_view`.`name` AS `name`,`chart_view`.`name` AS `label`,`chart_view`.`scene_id` AS `pid`,'leaf' AS `node_type`,'chart' AS `model_type`,`chart_view`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_view`.`create_by` AS `create_by` from `chart_view` union all select `panel_group`.`id` AS `id`,`panel_group`.`name` AS `NAME`,`panel_group`.`name` AS `label`,(case `panel_group`.`id` when 'panel_list' then '0' when 'default_panel' then '0' else `panel_group`.`pid` end) AS `pid`,if((`panel_group`.`node_type` = 'folder'),'spine','leaf') AS `node_type`,'panel' AS `model_type`,`panel_group`.`panel_type` AS `model_inner_type`,'source' AS `auth_type`,`panel_group`.`create_by` AS `create_by` from `panel_group` union all select `sys_menu`.`menu_id` AS `menu_id`,`sys_menu`.`title` AS `name`,`sys_menu`.`title` AS `label`,`sys_menu`.`pid` AS `pid`,if((`sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`sys_menu`.`create_by` AS `create_by` from `sys_menu` where (((`sys_menu`.`permission` is not null) or (`sys_menu`.`pid` = 0)) and ((`sys_menu`.`name` <> 'panel') or isnull(`sys_menu`.`name`))) union all select `plugin_sys_menu`.`menu_id` AS `menu_id`,`plugin_sys_menu`.`title` AS `name`,`plugin_sys_menu`.`title` AS `label`,`plugin_sys_menu`.`pid` AS `pid`,if((`plugin_sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `plugin_sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`plugin_sys_menu`.`create_by` AS `create_by` from `plugin_sys_menu` where ((`plugin_sys_menu`.`permission` is not null) or (`plugin_sys_menu`.`pid` = 0)); +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS select `sys_user`.`user_id` AS `id`,`sys_user`.`username` AS `name`,`sys_user`.`username` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'user' AS `model_type`,'user' AS `model_inner_type`,'target' AS `auth_type`,`sys_user`.`create_by` AS `create_by` from `sys_user` union all select `sys_role`.`role_id` AS `id`,`sys_role`.`name` AS `name`,`sys_role`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'role' AS `model_type`,'role' AS `model_inner_type`,'target' AS `auth_type`,`sys_role`.`create_by` AS `create_by` from `sys_role` union all select `sys_dept`.`dept_id` AS `id`,`sys_dept`.`name` AS `name`,`sys_dept`.`name` AS `lable`,cast(`sys_dept`.`pid` as char) AS `pid`,if((`sys_dept`.`sub_count` = 0),'leaf','spine') AS `node_type`,'dept' AS `model_type`,'dept' AS `model_inner_type`,'target' AS `auth_type`,`sys_dept`.`create_by` AS `create_by` from `sys_dept` union all select `datasource`.`id` AS `id`,`datasource`.`name` AS `NAME`,`datasource`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'link' AS `model_type`,`datasource`.`type` AS `model_inner_type`,'source' AS `auth_type`,`datasource`.`create_by` AS `create_by` from `datasource` union all select `dataset_group`.`id` AS `id`,`dataset_group`.`name` AS `NAME`,`dataset_group`.`name` AS `lable`,if(isnull(`dataset_group`.`pid`),'0',`dataset_group`.`pid`) AS `pid`,'spine' AS `node_type`,'dataset' AS `model_type`,`dataset_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_group`.`create_by` AS `create_by` from `dataset_group` union all select `dataset_table`.`id` AS `id`,`dataset_table`.`name` AS `NAME`,`dataset_table`.`name` AS `lable`,`dataset_table`.`scene_id` AS `pid`,'leaf' AS `node_type`,'dataset' AS `model_type`,`dataset_table`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_table`.`create_by` AS `create_by` from `dataset_table` union all select `chart_group`.`id` AS `id`,`chart_group`.`name` AS `name`,`chart_group`.`name` AS `label`,if(isnull(`chart_group`.`pid`),'0',`chart_group`.`pid`) AS `pid`,'spine' AS `node_type`,'chart' AS `model_type`,`chart_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_group`.`create_by` AS `create_by` from `chart_group` union all select `chart_view`.`id` AS `id`,`chart_view`.`name` AS `name`,`chart_view`.`name` AS `label`,`chart_view`.`scene_id` AS `pid`,'leaf' AS `node_type`,'chart' AS `model_type`,`chart_view`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_view`.`create_by` AS `create_by` from `chart_view` union all select `panel_group`.`id` AS `id`,`panel_group`.`name` AS `NAME`,`panel_group`.`name` AS `label`,(case `panel_group`.`id` when 'panel_list' then '0' when 'default_panel' then '0' else `panel_group`.`pid` end) AS `pid`,if((`panel_group`.`node_type` = 'folder'),'spine','leaf') AS `node_type`,'panel' AS `model_type`,`panel_group`.`panel_type` AS `model_inner_type`,'source' AS `auth_type`,`panel_group`.`create_by` AS `create_by` from `panel_group` union all select `sys_menu`.`menu_id` AS `menu_id`,`sys_menu`.`title` AS `name`,`sys_menu`.`title` AS `label`,`sys_menu`.`pid` AS `pid`,if((`sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`sys_menu`.`create_by` AS `create_by` from `sys_menu` where (((`sys_menu`.`permission` is not null) or (`sys_menu`.`pid` = 0)) and ((`sys_menu`.`name` <> 'panel') or isnull(`sys_menu`.`name`))) union all select `plugin_sys_menu`.`menu_id` AS `menu_id`,`plugin_sys_menu`.`title` AS `name`,`plugin_sys_menu`.`title` AS `label`,`plugin_sys_menu`.`pid` AS `pid`,if((`plugin_sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `plugin_sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`plugin_sys_menu`.`create_by` AS `create_by` from `plugin_sys_menu` where ((`plugin_sys_menu`.`permission` is not null) or (`plugin_sys_menu`.`pid` = 0)); diff --git a/backend/src/main/resources/db/migration/V17__update_auth.sql b/backend/src/main/resources/db/migration/V17__update_auth.sql index 182c72d824..a38ca7c90c 100644 --- a/backend/src/main/resources/db/migration/V17__update_auth.sql +++ b/backend/src/main/resources/db/migration/V17__update_auth.sql @@ -33,7 +33,7 @@ SELECT `sys_dept`.`dept_id` AS `id`, `sys_dept`.`name` AS `name`, `sys_dept`.`name` AS `lable`, - cast( `sys_dept`.`pid` AS CHAR charset utf8mb4 ) AS `pid`, + cast( `sys_dept`.`pid` AS CHAR ) AS `pid`, IF (( `sys_dept`.`sub_count` = 0 ), 'leaf', 'spine' ) AS `node_type`, 'dept' AS `model_type`, diff --git a/backend/src/main/resources/db/migration/V18__add_demo.sql b/backend/src/main/resources/db/migration/V18__add_demo.sql index 9a46441c40..0151febf9a 100644 --- a/backend/src/main/resources/db/migration/V18__add_demo.sql +++ b/backend/src/main/resources/db/migration/V18__add_demo.sql @@ -223,9 +223,6 @@ INSERT INTO `demo_sales_dashboard` (`year`,`mounth`,`sales_dept`,`product_name`, INSERT INTO `demo_sales_dashboard` (`year`,`mounth`,`sales_dept`,`product_name`,`sales_qty`,`sales_amount`,`target_qty`) VALUES (2020,11,'销售三部','睡袋',77,777,500); INSERT INTO `demo_sales_dashboard` (`year`,`mounth`,`sales_dept`,`product_name`,`sales_qty`,`sales_amount`,`target_qty`) VALUES (2020,12,'销售一部','睡袋',67,545,500); - - -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- diff --git a/backend/src/main/resources/db/migration/V19__area_mapping.sql b/backend/src/main/resources/db/migration/V19__area_mapping.sql index 284d34df9f..2b56d861e8 100644 --- a/backend/src/main/resources/db/migration/V19__area_mapping.sql +++ b/backend/src/main/resources/db/migration/V19__area_mapping.sql @@ -5,8 +5,6 @@ UPDATE `chart_view` SET `ext_bubble` = '[]'; ALTER TABLE `dataset_table_field` MODIFY COLUMN `origin_name` LONGTEXT; - -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -14,11 +12,11 @@ SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- CREATE TABLE `dataset_table_function` ( `id` bigint(20) NOT NULL COMMENT 'ID', - `name` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '函数名称', - `func` varchar(500) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '函数表达式', - `db_type` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '所属数据库', + `name` varchar(255) DEFAULT NULL COMMENT '函数名称', + `func` varchar(500) DEFAULT NULL COMMENT '函数表达式', + `db_type` varchar(255) DEFAULT NULL COMMENT '所属数据库', `func_type` int(10) DEFAULT NULL COMMENT '函数类型：0-聚合函数；1-快速计算函数；2-数学和三角函数；3-日期函数；4-文本函数；5-逻辑函数；6-其它函数', - `desc` longtext COLLATE utf8mb4_bin COMMENT '描述', + `desc` longtext COMMENT '描述', PRIMARY KEY (`id`) ) ; @@ -155,7 +153,6 @@ SET FOREIGN_KEY_CHECKS = 1; ALTER TABLE `chart_view` ADD COLUMN `drill_fields` LONGTEXT COMMENT '钻取字段' AFTER `custom_filter`; UPDATE `chart_view` SET `drill_fields` = '[]'; -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- @@ -164,12 +161,12 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `area_mapping`; CREATE TABLE `area_mapping` ( `id` bigint(20) NOT NULL COMMENT 'id', - `province_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省名称', - `province_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省代码', - `city_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市名称', - `city_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市代码', - `county_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县名称', - `county_code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '县代码', + `province_name` varchar(255) NULL DEFAULT NULL COMMENT '省名称', + `province_code` varchar(255) NULL DEFAULT NULL COMMENT '省代码', + `city_name` varchar(255) NULL DEFAULT NULL COMMENT '市名称', + `city_code` varchar(255) NULL DEFAULT NULL COMMENT '市代码', + `county_name` varchar(255) NULL DEFAULT NULL COMMENT '县名称', + `county_code` varchar(255) NULL DEFAULT NULL COMMENT '县代码', PRIMARY KEY (`id`) USING BTREE ) ; diff --git a/backend/src/main/resources/db/migration/V20__linkage_table.sql b/backend/src/main/resources/db/migration/V20__linkage_table.sql index 5704747cd0..e0dbf4ff33 100644 --- a/backend/src/main/resources/db/migration/V20__linkage_table.sql +++ b/backend/src/main/resources/db/migration/V20__linkage_table.sql @@ -1,4 +1,3 @@ -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- diff --git a/backend/src/main/resources/db/migration/V22__record_auth_view.sql b/backend/src/main/resources/db/migration/V22__record_auth_view.sql index e7ca8fcd5a..99b07f3323 100644 --- a/backend/src/main/resources/db/migration/V22__record_auth_view.sql +++ b/backend/src/main/resources/db/migration/V22__record_auth_view.sql @@ -33,7 +33,7 @@ SELECT `sys_dept`.`dept_id` AS `id`, `sys_dept`.`name` AS `name`, `sys_dept`.`name` AS `lable`, - cast( `sys_dept`.`pid` AS CHAR charset utf8mb4 ) AS `pid`, + cast( `sys_dept`.`pid` AS CHAR ) AS `pid`, IF (( `sys_dept`.`sub_count` = 0 ), 'leaf', 'spine' ) AS `node_type`, 'dept' AS `model_type`, diff --git a/backend/src/main/resources/db/migration/V24__new_demo_panel.sql b/backend/src/main/resources/db/migration/V24__new_demo_panel.sql index 36a1c22cfb..68d1b44b23 100644 --- a/backend/src/main/resources/db/migration/V24__new_demo_panel.sql +++ b/backend/src/main/resources/db/migration/V24__new_demo_panel.sql @@ -1,6 +1,3 @@ - - -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- diff --git a/backend/src/main/resources/db/migration/V27__de1.4.sql b/backend/src/main/resources/db/migration/V27__de1.4.sql index 44a66b3763..102dfbd847 100644 --- a/backend/src/main/resources/db/migration/V27__de1.4.sql +++ b/backend/src/main/resources/db/migration/V27__de1.4.sql @@ -39,8 +39,8 @@ COMMIT; ALTER TABLE `chart_view` -MODIFY COLUMN `name` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '名称' AFTER `id`, -MODIFY COLUMN `title` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'EChart标题' AFTER `name`; +MODIFY COLUMN `name` varchar(1024) NULL DEFAULT NULL COMMENT '名称' AFTER `id`, +MODIFY COLUMN `title` varchar(1024) NULL DEFAULT NULL COMMENT 'EChart标题' AFTER `name`; ALTER TABLE `chart_view` ADD COLUMN `result_count` int(10) COMMENT '展示结果' AFTER `render`; ALTER TABLE `chart_view` ADD COLUMN `result_mode` varchar(50) COMMENT '展示模式' AFTER `result_count`; @@ -48,7 +48,7 @@ UPDATE `chart_view` SET `result_count` = 1000; UPDATE `chart_view` SET `result_mode` = 'custom'; ALTER TABLE `dataset_table` - MODIFY COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL; + MODIFY COLUMN `name` varchar(128) NULL DEFAULT NULL; -- ---------------------------- -- Table structure for sys_theme diff --git a/backend/src/main/resources/db/migration/V28__de1.5.sql b/backend/src/main/resources/db/migration/V28__de1.5.sql index d3f2547ac3..5ecc3dd73e 100644 --- a/backend/src/main/resources/db/migration/V28__de1.5.sql +++ b/backend/src/main/resources/db/migration/V28__de1.5.sql @@ -50,7 +50,7 @@ CREATE TABLE `sys_task` ( `create_time` bigint(13) DEFAULT NULL COMMENT '创建时间', PRIMARY KEY (`task_id`), KEY `sys_task_type` (`task_type`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 +) ENGINE=InnoDB AUTO_INCREMENT=1; -- ---------------------------- -- Table structure for sys_task_instance @@ -64,7 +64,7 @@ CREATE TABLE `sys_task_instance` ( `status` int(10) DEFAULT NULL COMMENT '实例状态', `info` longtext COMMENT '执行信息', PRIMARY KEY (`instance_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 +) ENGINE=InnoDB AUTO_INCREMENT=1; -- ---------------------------- -- Table structure for sys_task_email @@ -79,4 +79,4 @@ CREATE TABLE `sys_task_email` ( `pixel` varchar(255) DEFAULT NULL COMMENT '像素', `task_id` bigint(20) NOT NULL COMMENT '任务ID', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 +) ENGINE=InnoDB AUTO_INCREMENT=1; diff --git a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql index 44298ebf35..7f289b7195 100644 --- a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql @@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `file_metadata` ( ); CREATE TABLE IF NOT EXISTS `system_parameter` ( - `param_key` varchar(64) CHARACTER SET utf8mb4 NOT NULL COMMENT 'Parameter name', + `param_key` varchar(64) NOT NULL COMMENT 'Parameter name', `param_value` varchar(255) DEFAULT NULL COMMENT 'Parameter value', `type` varchar(100) NOT NULL DEFAULT 'text' COMMENT 'Parameter type', `sort` int(5) DEFAULT NULL COMMENT 'Sort', diff --git a/backend/src/main/resources/db/migration/V5__auth.sql b/backend/src/main/resources/db/migration/V5__auth.sql index 5b09492f18..d4b8fa7451 100644 --- a/backend/src/main/resources/db/migration/V5__auth.sql +++ b/backend/src/main/resources/db/migration/V5__auth.sql @@ -1,22 +1,19 @@ - - SET FOREIGN_KEY_CHECKS = 1; -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- Table structure for sys_auth -- ---------------------------- CREATE TABLE `sys_auth` ( - `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `auth_source` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权资产源 数据集 视图 仪表板', - `auth_source_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权资产类型 dataset 数据集 view 视图 panel 仪表板', - `auth_target` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权目标 用户 角色 组织 ', - `auth_target_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权目标类型 user 用户 role 角色 org dept 组织', + `id` varchar(50) NOT NULL, + `auth_source` varchar(255) NULL DEFAULT NULL COMMENT '授权资产源 数据集 视图 仪表板', + `auth_source_type` varchar(255) NULL DEFAULT NULL COMMENT '授权资产类型 dataset 数据集 view 视图 panel 仪表板', + `auth_target` varchar(255) NULL DEFAULT NULL COMMENT '授权目标 用户 角色 组织 ', + `auth_target_type` varchar(255) NULL DEFAULT NULL COMMENT '授权目标类型 user 用户 role 角色 org dept 组织', `auth_time` bigint(13) NULL DEFAULT NULL COMMENT '授权时间', - `auth_details` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权明细 privilegename 名称 privilegeType 权限类型 1 查看 2 管理 3 导出 4 使用 ; privilegeValue 1 不可用 2 可用 3 部分可用', - `auth_user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '授权人员', + `auth_details` varchar(2000) NULL DEFAULT NULL COMMENT '授权明细 privilegename 名称 privilegeType 权限类型 1 查看 2 管理 3 导出 4 使用 ; privilegeValue 1 不可用 2 可用 3 部分可用', + `auth_user` varchar(255) NULL DEFAULT NULL COMMENT '授权人员', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE ) ; @@ -25,14 +22,14 @@ CREATE TABLE `sys_auth` ( -- Table structure for sys_auth_detail -- ---------------------------- CREATE TABLE `sys_auth_detail` ( - `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL, - `auth_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - `privilege_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限名称', + `id` varchar(50) NOT NULL, + `auth_id` varchar(50) NULL DEFAULT NULL, + `privilege_name` varchar(255) NULL DEFAULT NULL COMMENT '权限名称', `privilege_type` int(6) NULL DEFAULT NULL COMMENT '权限类型', `privilege_value` int(6) NULL DEFAULT NULL COMMENT '权限值 1 可用 2 不用', - `privilege_extend` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限扩展', - `remark` varchar(2000) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `create_user` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `privilege_extend` varchar(2000) NULL DEFAULT NULL COMMENT '权限扩展', + `remark` varchar(2000) NULL DEFAULT NULL COMMENT '备注', + `create_user` varchar(255) NULL DEFAULT NULL, `create_time` bigint(13) NULL DEFAULT NULL, `update_time` bigint(13) NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE @@ -42,18 +39,33 @@ CREATE TABLE `sys_auth_detail` ( -- Records of sys_auth_detail -- ---------------------------- BEGIN; -INSERT INTO `sys_auth_detail` VALUES ('chart_grant', 'chart', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), ('chart_manage', 'chart', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), ('chart_use', 'chart', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), ('dataset_grant', 'dataset', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), ('dataset_manege', 'dataset', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), ('dataset_use', 'dataset', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), ('link_grant', 'link', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), ('link_manage', 'link', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), ('link_use', 'link', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), ('menu_grant', 'menu', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), ('menu_use', 'menu', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), ('panel_export', 'panel', 'i18n_auth_export', 3, 0, 'export', '基础权限-导出', 'system', NULL, NULL), ('panel_grant', 'panel', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), ('panel_manage', 'panel', 'i18n_auth_manage', 5, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), ('panel_use', 'panel', 'i18n_auth_view', 1, 0, 'view', '基础权限-查看', 'system', NULL, NULL); +INSERT INTO `sys_auth_detail` +VALUES +('chart_grant', 'chart', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), +('chart_manage', 'chart', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), +('chart_use', 'chart', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), +('dataset_grant', 'dataset', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), +('dataset_manege', 'dataset', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), +('dataset_use', 'dataset', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), +('link_grant', 'link', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), +('link_manage', 'link', 'i18n_auth_manage', 3, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), +('link_use', 'link', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), +('menu_grant', 'menu', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), +('menu_use', 'menu', 'i18n_auth_use', 1, 0, 'use', '基础权限-使用', 'system', NULL, NULL), +('panel_export', 'panel', 'i18n_auth_export', 3, 0, 'export', '基础权限-导出', 'system', NULL, NULL), +('panel_grant', 'panel', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'system', NULL, NULL), +('panel_manage', 'panel', 'i18n_auth_manage', 5, 0, 'manage', '基础权限-管理', 'system', NULL, NULL), +('panel_use', 'panel', 'i18n_auth_view', 1, 0, 'view', '基础权限-查看', 'system', NULL, NULL); COMMIT; SET FOREIGN_KEY_CHECKS = 1; -SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- -- View structure for v_auth_model -- ---------------------------- -CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS select `sys_user`.`user_id` AS `id`,`sys_user`.`username` AS `name`,`sys_user`.`username` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'user' AS `model_type`,'user' AS `model_inner_type`,'target' AS `auth_type`,`sys_user`.`create_by` AS `create_by` from `sys_user` where (`sys_user`.`is_admin` <> 1) union all select `sys_role`.`role_id` AS `id`,`sys_role`.`name` AS `name`,`sys_role`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'role' AS `model_type`,'role' AS `model_inner_type`,'target' AS `auth_type`,`sys_role`.`create_by` AS `create_by` from `sys_role` union all select `sys_dept`.`dept_id` AS `id`,`sys_dept`.`name` AS `name`,`sys_dept`.`name` AS `lable`,cast(`sys_dept`.`pid` as char charset utf8mb4) AS `pid`,if((`sys_dept`.`sub_count` = 0),'leaf','spine') AS `node_type`,'dept' AS `model_type`,'dept' AS `model_inner_type`,'target' AS `auth_type`,`sys_dept`.`create_by` AS `create_by` from `sys_dept` union all select `datasource`.`id` AS `id`,`datasource`.`name` AS `NAME`,`datasource`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'link' AS `model_type`,`datasource`.`type` AS `model_inner_type`,'source' AS `auth_type`,`datasource`.`create_by` AS `create_by` from `datasource` union all select `dataset_group`.`id` AS `id`,`dataset_group`.`name` AS `NAME`,`dataset_group`.`name` AS `lable`,if(isnull(`dataset_group`.`pid`),'0',`dataset_group`.`pid`) AS `pid`,'spine' AS `node_type`,'dataset' AS `model_type`,`dataset_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_group`.`create_by` AS `create_by` from `dataset_group` union all select `dataset_table`.`id` AS `id`,`dataset_table`.`name` AS `NAME`,`dataset_table`.`name` AS `lable`,`dataset_table`.`scene_id` AS `pid`,'leaf' AS `node_type`,'dataset' AS `model_type`,`dataset_table`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_table`.`create_by` AS `create_by` from `dataset_table` union all select `chart_group`.`id` AS `id`,`chart_group`.`name` AS `name`,`chart_group`.`name` AS `label`,if(isnull(`chart_group`.`pid`),'0',`chart_group`.`pid`) AS `pid`,'spine' AS `node_type`,'chart' AS `model_type`,`chart_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_group`.`create_by` AS `create_by` from `chart_group` union all select `chart_view`.`id` AS `id`,`chart_view`.`name` AS `name`,`chart_view`.`name` AS `label`,`chart_view`.`scene_id` AS `pid`,'leaf' AS `node_type`,'chart' AS `model_type`,`chart_view`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_view`.`create_by` AS `create_by` from `chart_view` union all select `panel_group`.`id` AS `id`,`panel_group`.`name` AS `NAME`,`panel_group`.`name` AS `label`,(case `panel_group`.`id` when 'panel_list' then '0' when 'default_panel' then '0' else `panel_group`.`pid` end) AS `pid`,if((`panel_group`.`node_type` = 'folder'),'spine','leaf') AS `node_type`,'panel' AS `model_type`,`panel_group`.`panel_type` AS `model_inner_type`,'source' AS `auth_type`,`panel_group`.`create_by` AS `create_by` from `panel_group` union all select `sys_menu`.`menu_id` AS `menu_id`,`sys_menu`.`title` AS `name`,`sys_menu`.`title` AS `label`,`sys_menu`.`pid` AS `pid`,if((`sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`sys_menu`.`create_by` AS `create_by` from `sys_menu` where ((`sys_menu`.`hidden` = 0) and ((`sys_menu`.`name` <> 'panel') or isnull(`sys_menu`.`name`))) union all select `plugin_sys_menu`.`menu_id` AS `menu_id`,`plugin_sys_menu`.`title` AS `name`,`plugin_sys_menu`.`title` AS `label`,`plugin_sys_menu`.`pid` AS `pid`,if((`plugin_sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `plugin_sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`plugin_sys_menu`.`create_by` AS `create_by` from `plugin_sys_menu` where (`plugin_sys_menu`.`hidden` = 0); +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS select `sys_user`.`user_id` AS `id`,`sys_user`.`username` AS `name`,`sys_user`.`username` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'user' AS `model_type`,'user' AS `model_inner_type`,'target' AS `auth_type`,`sys_user`.`create_by` AS `create_by` from `sys_user` where (`sys_user`.`is_admin` <> 1) union all select `sys_role`.`role_id` AS `id`,`sys_role`.`name` AS `name`,`sys_role`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'role' AS `model_type`,'role' AS `model_inner_type`,'target' AS `auth_type`,`sys_role`.`create_by` AS `create_by` from `sys_role` union all select `sys_dept`.`dept_id` AS `id`,`sys_dept`.`name` AS `name`,`sys_dept`.`name` AS `lable`,cast(`sys_dept`.`pid` as char ) AS `pid`,if((`sys_dept`.`sub_count` = 0),'leaf','spine') AS `node_type`,'dept' AS `model_type`,'dept' AS `model_inner_type`,'target' AS `auth_type`,`sys_dept`.`create_by` AS `create_by` from `sys_dept` union all select `datasource`.`id` AS `id`,`datasource`.`name` AS `NAME`,`datasource`.`name` AS `label`,'0' AS `pid`,'leaf' AS `node_type`,'link' AS `model_type`,`datasource`.`type` AS `model_inner_type`,'source' AS `auth_type`,`datasource`.`create_by` AS `create_by` from `datasource` union all select `dataset_group`.`id` AS `id`,`dataset_group`.`name` AS `NAME`,`dataset_group`.`name` AS `lable`,if(isnull(`dataset_group`.`pid`),'0',`dataset_group`.`pid`) AS `pid`,'spine' AS `node_type`,'dataset' AS `model_type`,`dataset_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_group`.`create_by` AS `create_by` from `dataset_group` union all select `dataset_table`.`id` AS `id`,`dataset_table`.`name` AS `NAME`,`dataset_table`.`name` AS `lable`,`dataset_table`.`scene_id` AS `pid`,'leaf' AS `node_type`,'dataset' AS `model_type`,`dataset_table`.`type` AS `model_inner_type`,'source' AS `auth_type`,`dataset_table`.`create_by` AS `create_by` from `dataset_table` union all select `chart_group`.`id` AS `id`,`chart_group`.`name` AS `name`,`chart_group`.`name` AS `label`,if(isnull(`chart_group`.`pid`),'0',`chart_group`.`pid`) AS `pid`,'spine' AS `node_type`,'chart' AS `model_type`,`chart_group`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_group`.`create_by` AS `create_by` from `chart_group` union all select `chart_view`.`id` AS `id`,`chart_view`.`name` AS `name`,`chart_view`.`name` AS `label`,`chart_view`.`scene_id` AS `pid`,'leaf' AS `node_type`,'chart' AS `model_type`,`chart_view`.`type` AS `model_inner_type`,'source' AS `auth_type`,`chart_view`.`create_by` AS `create_by` from `chart_view` union all select `panel_group`.`id` AS `id`,`panel_group`.`name` AS `NAME`,`panel_group`.`name` AS `label`,(case `panel_group`.`id` when 'panel_list' then '0' when 'default_panel' then '0' else `panel_group`.`pid` end) AS `pid`,if((`panel_group`.`node_type` = 'folder'),'spine','leaf') AS `node_type`,'panel' AS `model_type`,`panel_group`.`panel_type` AS `model_inner_type`,'source' AS `auth_type`,`panel_group`.`create_by` AS `create_by` from `panel_group` union all select `sys_menu`.`menu_id` AS `menu_id`,`sys_menu`.`title` AS `name`,`sys_menu`.`title` AS `label`,`sys_menu`.`pid` AS `pid`,if((`sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`sys_menu`.`create_by` AS `create_by` from `sys_menu` where ((`sys_menu`.`hidden` = 0) and ((`sys_menu`.`name` <> 'panel') or isnull(`sys_menu`.`name`))) union all select `plugin_sys_menu`.`menu_id` AS `menu_id`,`plugin_sys_menu`.`title` AS `name`,`plugin_sys_menu`.`title` AS `label`,`plugin_sys_menu`.`pid` AS `pid`,if((`plugin_sys_menu`.`sub_count` > 0),'spine','leaf') AS `node_type`,'menu' AS `model_type`,(case `plugin_sys_menu`.`type` when 0 then 'folder' when 1 then 'menu' when 2 then 'button' end) AS `model_inner_type`,'source' AS `auth_type`,`plugin_sys_menu`.`create_by` AS `create_by` from `plugin_sys_menu` where (`plugin_sys_menu`.`hidden` = 0); -- ---------------------------- -- View structure for v_auth_privilege @@ -89,7 +101,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `copy_auth`(authSource varchar(255),authSourceType varchar(255),authUser varchar(255)) - RETURNS varchar(255) CHARSET utf8 + RETURNS varchar(255) READS SQL DATA BEGIN @@ -159,7 +171,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `delete_auth_source`(authSource varchar(255),authSourceType varchar(255)) - RETURNS varchar(255) CHARSET utf8 + RETURNS varchar(255) READS SQL DATA BEGIN @@ -180,7 +192,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `delete_auth_target`(authTarget varchar(255),authTargetType varchar(255)) - RETURNS varchar(255) CHARSET utf8 + RETURNS varchar(255) READS SQL DATA BEGIN @@ -201,7 +213,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `get_auths`(authSource varchar(255),modelType varchar(255),userId varchar(255)) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN @@ -246,7 +258,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `get_auth_children_count`(pidInfo varchar(255),modelType varchar(255),userName varchar(255)) - RETURNS varchar(255) CHARSET utf8 + RETURNS varchar(255) READS SQL DATA BEGIN @@ -270,7 +282,7 @@ delimiter ; delimiter ;; CREATE FUNCTION `get_grant_auths`(modelType VARCHAR ( 255 ), userId VARCHAR ( 255 )) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN DECLARE @@ -311,7 +323,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_PANEL_GROUP_WITH_CHILDREN`(parentId varchar(8000)) - RETURNS varchar(8000) CHARSET utf8 + RETURNS varchar(8000) READS SQL DATA BEGIN @@ -344,7 +356,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_PANEL_TEMPLATE_WITH_CHILDREN`(parentId varchar(8000)) - RETURNS varchar(8000) CHARSET utf8 + RETURNS varchar(8000) READS SQL DATA BEGIN @@ -377,7 +389,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_V_AUTH_MODEL_ID_P_USE`(userId longtext,modelType varchar(255)) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN @@ -398,7 +410,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_V_AUTH_MODEL_WITH_CHILDREN`(parentId longtext,modelType varchar(255)) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN @@ -431,7 +443,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_V_AUTH_MODEL_WITH_PARENT`(childrenId longtext,modelType varchar(255)) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN @@ -464,7 +476,7 @@ delimiter ; -- ---------------------------- delimiter ;; CREATE FUNCTION `GET_V_AUTH_MODEL_WITH_PRIVILEGE`(userId longtext,modelType varchar(255),privilegeType varchar(255)) - RETURNS longtext CHARSET utf8 + RETURNS longtext READS SQL DATA BEGIN diff --git a/backend/src/main/resources/db/migration/V9__chart_view_copy.sql b/backend/src/main/resources/db/migration/V9__chart_view_copy.sql index 0ede4b427f..7b9f6bcc26 100644 --- a/backend/src/main/resources/db/migration/V9__chart_view_copy.sql +++ b/backend/src/main/resources/db/migration/V9__chart_view_copy.sql @@ -1,5 +1,5 @@ delimiter ;; -CREATE FUNCTION `GET_CHART_VIEW_COPY_NAME`(chartId varchar(255)) RETURNS varchar(255) CHARSET utf8 +CREATE FUNCTION `GET_CHART_VIEW_COPY_NAME`(chartId varchar(255)) RETURNS varchar(255) READS SQL DATA BEGIN