From d10eaa8d8115aa46c84c2e24e98b23a82ad1139e Mon Sep 17 00:00:00 2001 From: Wenjun Ruan Date: Wed, 1 Feb 2023 14:08:31 +0800 Subject: [PATCH] Change mysql COLLATE to utf8_bin (#13469) --- .../resources/sql/dolphinscheduler_mysql.sql | 126 +++++++++--------- .../mysql/dolphinscheduler_ddl.sql | 68 ++++++++++ 2 files changed, 131 insertions(+), 63 deletions(-) diff --git a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql index 062db95c6b..07ab0d3ef2 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql @@ -29,7 +29,7 @@ CREATE TABLE `QRTZ_BLOB_TRIGGERS` ( PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), KEY `SCHED_NAME` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `QRTZ_BLOB_TRIGGERS_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_BLOB_TRIGGERS @@ -44,7 +44,7 @@ CREATE TABLE `QRTZ_CALENDARS` ( `CALENDAR_NAME` varchar(200) NOT NULL, `CALENDAR` blob NOT NULL, PRIMARY KEY (`SCHED_NAME`,`CALENDAR_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_CALENDARS @@ -62,7 +62,7 @@ CREATE TABLE `QRTZ_CRON_TRIGGERS` ( `TIME_ZONE_ID` varchar(80) DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `QRTZ_CRON_TRIGGERS_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_CRON_TRIGGERS @@ -93,7 +93,7 @@ CREATE TABLE `QRTZ_FIRED_TRIGGERS` ( KEY `IDX_QRTZ_FT_JG` (`SCHED_NAME`,`JOB_GROUP`), KEY `IDX_QRTZ_FT_T_G` (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), KEY `IDX_QRTZ_FT_TG` (`SCHED_NAME`,`TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_FIRED_TRIGGERS @@ -117,7 +117,7 @@ CREATE TABLE `QRTZ_JOB_DETAILS` ( PRIMARY KEY (`SCHED_NAME`,`JOB_NAME`,`JOB_GROUP`), KEY `IDX_QRTZ_J_REQ_RECOVERY` (`SCHED_NAME`,`REQUESTS_RECOVERY`), KEY `IDX_QRTZ_J_GRP` (`SCHED_NAME`,`JOB_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_JOB_DETAILS @@ -131,7 +131,7 @@ CREATE TABLE `QRTZ_LOCKS` ( `SCHED_NAME` varchar(120) NOT NULL, `LOCK_NAME` varchar(40) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`LOCK_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_LOCKS @@ -145,7 +145,7 @@ CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS` ( `SCHED_NAME` varchar(120) NOT NULL, `TRIGGER_GROUP` varchar(200) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_PAUSED_TRIGGER_GRPS @@ -161,7 +161,7 @@ CREATE TABLE `QRTZ_SCHEDULER_STATE` ( `LAST_CHECKIN_TIME` bigint(13) NOT NULL, `CHECKIN_INTERVAL` bigint(13) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`INSTANCE_NAME`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_SCHEDULER_STATE @@ -180,7 +180,7 @@ CREATE TABLE `QRTZ_SIMPLE_TRIGGERS` ( `TIMES_TRIGGERED` bigint(10) NOT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `QRTZ_SIMPLE_TRIGGERS_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_SIMPLE_TRIGGERS @@ -207,7 +207,7 @@ CREATE TABLE `QRTZ_SIMPROP_TRIGGERS` ( `BOOL_PROP_2` varchar(1) DEFAULT NULL, PRIMARY KEY (`SCHED_NAME`,`TRIGGER_NAME`,`TRIGGER_GROUP`), CONSTRAINT `QRTZ_SIMPROP_TRIGGERS_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) REFERENCES `QRTZ_TRIGGERS` (`SCHED_NAME`, `TRIGGER_NAME`, `TRIGGER_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_SIMPROP_TRIGGERS @@ -248,7 +248,7 @@ CREATE TABLE `QRTZ_TRIGGERS` ( KEY `IDX_QRTZ_T_NFT_ST_MISFIRE` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_STATE`), KEY `IDX_QRTZ_T_NFT_ST_MISFIRE_GRP` (`SCHED_NAME`,`MISFIRE_INSTR`,`NEXT_FIRE_TIME`,`TRIGGER_GROUP`,`TRIGGER_STATE`), CONSTRAINT `QRTZ_TRIGGERS_ibfk_1` FOREIGN KEY (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) REFERENCES `QRTZ_JOB_DETAILS` (`SCHED_NAME`, `JOB_NAME`, `JOB_GROUP`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of QRTZ_TRIGGERS @@ -266,7 +266,7 @@ CREATE TABLE `t_ds_access_token` ( `create_time` datetime DEFAULT NULL COMMENT 'create time', `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_access_token @@ -294,7 +294,7 @@ CREATE TABLE `t_ds_alert` ( PRIMARY KEY (`id`), KEY `idx_status` (`alert_status`) USING BTREE, KEY `idx_sign` (`sign`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_alert @@ -314,7 +314,7 @@ CREATE TABLE `t_ds_alertgroup`( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `t_ds_alertgroup_name_un` (`group_name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_alertgroup @@ -346,7 +346,7 @@ CREATE TABLE `t_ds_command` ( `test_flag` tinyint(4) DEFAULT null COMMENT 'test flag：0 normal, 1 test run', PRIMARY KEY (`id`), KEY `priority_id_index` (`process_instance_priority`,`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_command @@ -369,7 +369,7 @@ CREATE TABLE `t_ds_datasource` ( `bind_test_id` int(11) DEFAULT NULL COMMENT 'bind testDataSource id', PRIMARY KEY (`id`), UNIQUE KEY `t_ds_datasource_name_un` (`name`, `type`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_datasource @@ -401,7 +401,7 @@ CREATE TABLE `t_ds_error_command` ( `dry_run` tinyint(4) DEFAULT '0' COMMENT 'dry run flag: 0 normal, 1 dry run', `test_flag` tinyint(4) DEFAULT null COMMENT 'test flag：0 normal, 1 test run', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_error_command @@ -431,7 +431,7 @@ CREATE TABLE `t_ds_process_definition` ( `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`,`code`), UNIQUE KEY `process_unique` (`name`,`project_code`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_process_definition @@ -463,7 +463,7 @@ CREATE TABLE `t_ds_process_definition_log` ( `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `uniq_idx_code_version` (`code`,`version`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_task_definition @@ -499,7 +499,7 @@ CREATE TABLE `t_ds_task_definition` ( `create_time` datetime NOT NULL COMMENT 'create time', `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`,`code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_task_definition_log @@ -539,7 +539,7 @@ CREATE TABLE `t_ds_task_definition_log` ( PRIMARY KEY (`id`), KEY `idx_code_version` (`code`,`version`), KEY `idx_project_code` (`project_code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_process_task_relation @@ -563,7 +563,7 @@ CREATE TABLE `t_ds_process_task_relation` ( KEY `idx_code` (`project_code`,`process_definition_code`), KEY `idx_pre_task_code_version` (`pre_task_code`,`pre_task_version`), KEY `idx_post_task_code_version` (`post_task_code`,`post_task_version`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_process_task_relation_log @@ -587,7 +587,7 @@ CREATE TABLE `t_ds_process_task_relation_log` ( `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`), KEY `idx_process_code_version` (`process_definition_code`,`process_definition_version`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_process_instance @@ -636,7 +636,7 @@ CREATE TABLE `t_ds_process_instance` ( PRIMARY KEY (`id`), KEY `process_instance_index` (`process_definition_code`,`id`) USING BTREE, KEY `start_time_index` (`start_time`,`end_time`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_process_instance @@ -659,7 +659,7 @@ CREATE TABLE `t_ds_project` ( KEY `user_id_index` (`user_id`) USING BTREE, UNIQUE KEY `unique_name`(`name`), UNIQUE KEY `unique_code`(`code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_project @@ -677,7 +677,7 @@ CREATE TABLE `t_ds_queue` ( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `unique_queue_name`(`queue_name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_queue @@ -696,7 +696,7 @@ CREATE TABLE `t_ds_relation_datasource_user` ( `create_time` datetime DEFAULT NULL COMMENT 'create time', `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_relation_datasource_user @@ -714,7 +714,7 @@ CREATE TABLE `t_ds_relation_process_instance` ( PRIMARY KEY (`id`), KEY `idx_parent_process_task` (`parent_process_instance_id`,`parent_task_instance_id`) , KEY `idx_process_instance_id` (`process_instance_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_relation_process_instance @@ -733,7 +733,7 @@ CREATE TABLE `t_ds_relation_project_user` ( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY uniq_uid_pid(user_id,project_id) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_relation_project_user @@ -751,7 +751,7 @@ CREATE TABLE `t_ds_relation_resources_user` ( `create_time` datetime DEFAULT NULL COMMENT 'create time', `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_relation_resources_user @@ -769,7 +769,7 @@ CREATE TABLE `t_ds_relation_udfs_user` ( `create_time` datetime DEFAULT NULL COMMENT 'create time', `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_resources @@ -790,7 +790,7 @@ CREATE TABLE `t_ds_resources` ( `is_directory` tinyint(4) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `t_ds_resources_un` (`full_name`,`type`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_resources @@ -807,7 +807,7 @@ CREATE TABLE `t_ds_relation_resources_task` ( `type` tinyint DEFAULT NULL COMMENT 'resource type,0:FILE,1:UDF', PRIMARY KEY (`id`), UNIQUE KEY `t_ds_relation_resources_task_un` (`task_id`, `full_name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_relation_resources_task @@ -835,7 +835,7 @@ CREATE TABLE `t_ds_schedules` ( `create_time` datetime NOT NULL COMMENT 'create time', `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_schedules @@ -851,7 +851,7 @@ CREATE TABLE `t_ds_session` ( `ip` varchar(45) DEFAULT NULL COMMENT 'ip', `last_login_time` datetime DEFAULT NULL COMMENT 'last login time', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_session @@ -906,7 +906,7 @@ CREATE TABLE `t_ds_task_instance` ( KEY `process_instance_id` (`process_instance_id`) USING BTREE, KEY `idx_code_version` (`task_code`, `task_definition_version`) USING BTREE, KEY `idx_cache_key` (`cache_key`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_task_instance @@ -925,7 +925,7 @@ CREATE TABLE `t_ds_tenant` ( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `unique_tenant_code`(`tenant_code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_tenant @@ -950,7 +950,7 @@ CREATE TABLE `t_ds_udfs` ( `update_time` datetime NOT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `unique_func_name`(`func_name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_udfs @@ -975,7 +975,7 @@ CREATE TABLE `t_ds_user` ( `time_zone` varchar(32) DEFAULT NULL COMMENT 'time zone', PRIMARY KEY (`id`), UNIQUE KEY `user_name_unique` (`user_name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_user @@ -995,7 +995,7 @@ CREATE TABLE `t_ds_worker_group` ( `other_params_json` text NULL DEFAULT NULL COMMENT 'other params json', PRIMARY KEY (`id`), UNIQUE KEY `name_unique` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Records of t_ds_worker_group @@ -1010,7 +1010,7 @@ CREATE TABLE `t_ds_version` ( `version` varchar(200) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `version_UNIQUE` (`version`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='version'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE = utf8_bin COMMENT='version'; -- ---------------------------- -- Records of t_ds_version @@ -1044,7 +1044,7 @@ CREATE TABLE `t_ds_plugin_define` ( `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `t_ds_plugin_define_UN` (`plugin_name`,`plugin_type`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_alert_plugin_instance @@ -1058,7 +1058,7 @@ CREATE TABLE `t_ds_alert_plugin_instance` ( `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `instance_name` varchar(200) DEFAULT NULL COMMENT 'alert instance name', PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- -- Table structure for table `t_ds_dq_comparison_type` @@ -1074,7 +1074,7 @@ CREATE TABLE `t_ds_dq_comparison_type` ( `update_time` datetime DEFAULT NULL, `is_inner_source` tinyint(1) DEFAULT '0', PRIMARY KEY (`id`) -)ENGINE=InnoDB DEFAULT CHARSET=utf8; +)ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_dq_comparison_type` (`id`, `type`, `execute_sql`, `output_table`, `name`, `create_time`, `update_time`, `is_inner_source`) @@ -1125,7 +1125,7 @@ CREATE TABLE `t_ds_dq_execute_result` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- -- Table structure for table t_ds_dq_rule @@ -1139,7 +1139,7 @@ CREATE TABLE `t_ds_dq_rule` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_dq_rule` (`id`, `name`, `type`, `user_id`, `create_time`, `update_time`) @@ -1186,7 +1186,7 @@ CREATE TABLE `t_ds_dq_rule_execute_sql` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_dq_rule_execute_sql` (`id`, `index`, `sql`, `table_alias`, `type`, `is_error_output_sql`, `create_time`, `update_time`) @@ -1262,7 +1262,7 @@ CREATE TABLE `t_ds_dq_rule_input_entry` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_dq_rule_input_entry` (`id`, `field`, `type`, `title`, `value`, `options`, `placeholder`, `option_source_type`, `value_type`, `input_type`, `is_show`, `can_edit`, `is_emit`, `is_validate`, `create_time`, `update_time`) @@ -1368,7 +1368,7 @@ CREATE TABLE `t_ds_dq_task_statistics_value` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- -- Table structure for table `t_ds_relation_rule_execute_sql` @@ -1381,7 +1381,7 @@ CREATE TABLE `t_ds_relation_rule_execute_sql` ( `create_time` datetime NULL, `update_time` datetime NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_relation_rule_execute_sql` (`id`, `rule_id`, `execute_sql_id`, `create_time`, `update_time`) @@ -1442,7 +1442,7 @@ CREATE TABLE `t_ds_relation_rule_input_entry` ( `create_time` datetime DEFAULT NULL, `update_time` datetime DEFAULT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE = utf8_bin; INSERT IGNORE INTO `t_ds_relation_rule_input_entry` (`id`, `rule_id`, `rule_input_entry_id`, `values_map`, `index`, `create_time`, `update_time`) @@ -1854,7 +1854,7 @@ CREATE TABLE `t_ds_environment` ( PRIMARY KEY (`id`), UNIQUE KEY `environment_name_unique` (`name`), UNIQUE KEY `environment_code_unique` (`code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_environment_worker_group_relation @@ -1869,7 +1869,7 @@ CREATE TABLE `t_ds_environment_worker_group_relation` ( `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), UNIQUE KEY `environment_worker_group_unique` (`environment_code`,`worker_group`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_task_group_queue @@ -1888,7 +1888,7 @@ CREATE TABLE `t_ds_task_group_queue` ( `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY( `id` ) -)ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8; +)ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_task_group @@ -1906,7 +1906,7 @@ CREATE TABLE `t_ds_task_group` ( `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY(`id`) -) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8; +) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_audit_log @@ -1920,7 +1920,7 @@ CREATE TABLE `t_ds_audit_log` ( `time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time', `resource_id` int(11) NULL DEFAULT NULL COMMENT 'resource id', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT= 1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT= 1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_k8s @@ -1933,7 +1933,7 @@ CREATE TABLE `t_ds_k8s` ( `create_time` datetime DEFAULT NULL COMMENT 'create time', `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`) -) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8; +) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_k8s_namespace @@ -1954,7 +1954,7 @@ CREATE TABLE `t_ds_k8s_namespace` ( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `k8s_namespace_unique` (`namespace`,`cluster_code`) -) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8; +) ENGINE= INNODB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_relation_namespace_user @@ -1969,7 +1969,7 @@ CREATE TABLE `t_ds_relation_namespace_user` ( `update_time` datetime DEFAULT NULL COMMENT 'update time', PRIMARY KEY (`id`), UNIQUE KEY `namespace_user_unique` (`user_id`,`namespace_id`) -) ENGINE=InnoDB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8; +) ENGINE=InnoDB AUTO_INCREMENT= 1 DEFAULT CHARSET= utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_alert_send_status @@ -1984,7 +1984,7 @@ CREATE TABLE t_ds_alert_send_status ( `create_time` datetime DEFAULT NULL COMMENT 'create time', PRIMARY KEY (`id`), UNIQUE KEY `alert_send_status_unique` (`alert_id`,`alert_plugin_instance_id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- @@ -2003,7 +2003,7 @@ CREATE TABLE `t_ds_cluster`( PRIMARY KEY (`id`), UNIQUE KEY `cluster_name_unique` (`name`), UNIQUE KEY `cluster_code_unique` (`code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; -- ---------------------------- -- Table structure for t_ds_fav_task @@ -2017,7 +2017,7 @@ CREATE TABLE `t_ds_fav_task` PRIMARY KEY (`id`) ) ENGINE = InnoDB AUTO_INCREMENT = 1 - DEFAULT CHARSET = utf8; + DEFAULT CHARSET = utf8 COLLATE = utf8_bin; CREATE TABLE `t_ds_trigger_relation` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, @@ -2029,4 +2029,4 @@ CREATE TABLE `t_ds_trigger_relation` ( PRIMARY KEY (`id`), KEY `t_ds_trigger_relation_trigger_code_IDX` (`trigger_code`), UNIQUE KEY `t_ds_trigger_relation_UN` (`trigger_type`,`job_id`,`trigger_code`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE = utf8_bin; diff --git a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_ddl.sql b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_ddl.sql index cc6335af92..8f31bbc73d 100644 --- a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_ddl.sql +++ b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/mysql/dolphinscheduler_ddl.sql @@ -297,3 +297,71 @@ d// delimiter ; CALL add_t_ds_task_instance_add_project_code; DROP PROCEDURE add_t_ds_task_instance_add_project_code; + +alter table QRTZ_BLOB_TRIGGERS collate = utf8mb4_bin; +alter table QRTZ_CALENDARS collate = utf8mb4_bin; +alter table QRTZ_CRON_TRIGGERS collate = utf8mb4_bin; +alter table QRTZ_FIRED_TRIGGERS collate = utf8mb4_bin; +alter table QRTZ_JOB_DETAILS collate = utf8mb4_bin; +alter table QRTZ_LOCKS collate = utf8mb4_bin; +alter table QRTZ_PAUSED_TRIGGER_GRPS collate = utf8mb4_bin; +alter table QRTZ_SCHEDULER_STATE collate = utf8mb4_bin; +alter table QRTZ_SIMPLE_TRIGGERS collate = utf8mb4_bin; +alter table QRTZ_SIMPROP_TRIGGERS collate = utf8mb4_bin; +alter table QRTZ_TRIGGERS collate = utf8mb4_bin; +alter table t_ds_access_token collate = utf8mb4_bin; +alter table t_ds_alert collate = utf8mb4_bin; +alter table t_ds_alertgroup collate = utf8mb4_bin; +alter table t_ds_command collate = utf8mb4_bin; +alter table t_ds_datasource collate = utf8mb4_bin; +alter table t_ds_error_command collate = utf8mb4_bin; +alter table t_ds_process_definition collate = utf8mb4_bin; +alter table t_ds_process_definition_log collate = utf8mb4_bin; +alter table t_ds_task_definition collate = utf8mb4_bin; +alter table t_ds_task_definition_log collate = utf8mb4_bin; +alter table t_ds_process_task_relation collate = utf8mb4_bin; +alter table t_ds_process_task_relation_log collate = utf8mb4_bin; +alter table t_ds_process_instance collate = utf8mb4_bin; +alter table t_ds_project collate = utf8mb4_bin; +alter table t_ds_queue collate = utf8mb4_bin; +alter table t_ds_relation_datasource_user collate = utf8mb4_bin; +alter table t_ds_relation_process_instance collate = utf8mb4_bin; +alter table t_ds_relation_project_user collate = utf8mb4_bin; +alter table t_ds_relation_resources_user collate = utf8mb4_bin; +alter table t_ds_relation_udfs_user collate = utf8mb4_bin; +alter table t_ds_resources collate = utf8mb4_bin; +alter table t_ds_relation_resources_task collate = utf8mb4_bin; +alter table t_ds_schedules collate = utf8mb4_bin; +alter table t_ds_session collate = utf8mb4_bin; +alter table t_ds_task_instance collate = utf8mb4_bin; +alter table t_ds_tenant collate = utf8mb4_bin; +alter table t_ds_udfs collate = utf8mb4_bin; +alter table t_ds_user collate = utf8mb4_bin; +alter table t_ds_worker_group collate = utf8mb4_bin; +alter table t_ds_version collate = utf8mb4_bin; +alter table t_ds_plugin_define collate = utf8mb4_bin; +alter table t_ds_alert_plugin_instance collate = utf8mb4_bin; +alter table t_ds_dq_comparison_type collate = utf8mb4_bin; +alter table t_ds_dq_execute_result collate = utf8mb4_bin; +alter table t_ds_dq_rule collate = utf8mb4_bin; +alter table t_ds_dq_rule_execute_sql collate = utf8mb4_bin; +alter table t_ds_dq_rule_input_entry collate = utf8mb4_bin; +alter table t_ds_dq_task_statistics_value collate = utf8mb4_bin; +alter table t_ds_relation_rule_execute_sql collate = utf8mb4_bin; +alter table t_ds_relation_rule_input_entry collate = utf8mb4_bin; +alter table t_ds_environment collate = utf8mb4_bin; +alter table t_ds_environment_worker_group_relation collate = utf8mb4_bin; +alter table t_ds_task_group_queue collate = utf8mb4_bin; +alter table t_ds_task_group collate = utf8mb4_bin; +alter table t_ds_audit_log collate = utf8mb4_bin; +alter table t_ds_k8s collate = utf8mb4_bin; +alter table t_ds_k8s_namespace collate = utf8mb4_bin; +alter table t_ds_relation_namespace_user collate = utf8mb4_bin; +alter table t_ds_alert_send_status collate = utf8mb4_bin; +alter table t_ds_cluster collate = utf8mb4_bin; +alter table t_ds_fav_task collate = utf8mb4_bin; +alter table t_ds_trigger_relation collate = utf8mb4_bin; + + + +