diff --git a/sql/soft_version b/sql/soft_version index 867e52437a..d2d61a7e8e 100644 --- a/sql/soft_version +++ b/sql/soft_version @@ -1 +1 @@ -1.2.0 \ No newline at end of file +1.2.2 \ No newline at end of file diff --git a/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql b/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql index 9fe246a8c2..8b970ab676 100644 --- a/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql +++ b/sql/upgrade/1.2.2_schema/mysql/dolphinscheduler_ddl.sql @@ -35,3 +35,123 @@ d// delimiter ; CALL uc_dolphin_T_t_ds_process_definition_A_modify_by; DROP PROCEDURE uc_dolphin_T_t_ds_process_definition_A_modify_by; + +-- ac_dolphin_T_t_ds_process_instance_A_worker_group +drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_process_instance_A_worker_group; +delimiter d// +CREATE PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group() + BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_process_instance' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group') + THEN + ALTER TABLE t_ds_process_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group'; + END IF; + END; + +d// + +delimiter ; +CALL ac_dolphin_T_t_ds_process_instance_A_worker_group; +DROP PROCEDURE ac_dolphin_T_t_ds_process_instance_A_worker_group; + +-- dc_dolphin_T_t_ds_process_instance_D_worker_group_id +drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_process_instance_D_worker_group_id; +delimiter d// +CREATE PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id() + BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_process_instance' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_process_instance DROP COLUMN worker_group_id; + END IF; + END; + +d// + +delimiter ; +CALL dc_dolphin_T_t_ds_process_instance_D_worker_group_id; +DROP PROCEDURE dc_dolphin_T_t_ds_process_instance_D_worker_group_id; + +-- ac_dolphin_T_t_ds_task_instance_A_worker_group +drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_task_instance_A_worker_group; +delimiter d// +CREATE PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group() + BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_task_instance' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group') + THEN + ALTER TABLE t_ds_task_instance ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group'; + END IF; + END; + +d// + +delimiter ; +CALL ac_dolphin_T_t_ds_task_instance_A_worker_group; +DROP PROCEDURE ac_dolphin_T_t_ds_task_instance_A_worker_group; + +-- dc_dolphin_T_t_ds_task_instance_D_worker_group_id +drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_task_instance_D_worker_group_id; +delimiter d// +CREATE PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id() + BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_task_instance' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_task_instance DROP COLUMN worker_group_id; + END IF; + END; + +d// + +delimiter ; +CALL dc_dolphin_T_t_ds_task_instance_D_worker_group_id; +DROP PROCEDURE dc_dolphin_T_t_ds_task_instance_D_worker_group_id; + +-- ac_dolphin_T_t_ds_schedules_A_worker_group +drop PROCEDURE if EXISTS ac_dolphin_T_t_ds_schedules_A_worker_group; +delimiter d// +CREATE PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group() + BEGIN + IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_schedules' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group') + THEN + ALTER TABLE t_ds_schedules ADD `worker_group` varchar(255) DEFAULT '' COMMENT 'worker group'; + END IF; + END; + +d// + +delimiter ; +CALL ac_dolphin_T_t_ds_schedules_A_worker_group; +DROP PROCEDURE ac_dolphin_T_t_ds_schedules_A_worker_group; + +-- dc_dolphin_T_t_ds_schedules_D_worker_group_id +drop PROCEDURE if EXISTS dc_dolphin_T_t_ds_schedules_D_worker_group_id; +delimiter d// +CREATE PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id() + BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_NAME='t_ds_schedules' + AND TABLE_SCHEMA=(SELECT DATABASE()) + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_schedules DROP COLUMN worker_group_id; + END IF; + END; + +d// + +delimiter ; +CALL dc_dolphin_T_t_ds_schedules_D_worker_group_id; +DROP PROCEDURE dc_dolphin_T_t_ds_schedules_D_worker_group_id; \ No newline at end of file diff --git a/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql index 6a5cded591..164f04e3bc 100644 --- a/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql +++ b/sql/upgrade/1.2.2_schema/postgresql/dolphinscheduler_ddl.sql @@ -53,6 +53,27 @@ delimiter ; select ac_dolphin_T_t_ds_process_instance_A_worker_group(); DROP FUNCTION ac_dolphin_T_t_ds_process_instance_A_worker_group(); +-- dc_dolphin_T_t_ds_process_instance_D_worker_group_id +delimiter ; +DROP FUNCTION IF EXISTS dc_dolphin_T_t_ds_process_instance_D_worker_group_id(); +delimiter d// +CREATE FUNCTION dc_dolphin_T_t_ds_process_instance_D_worker_group_id() RETURNS void AS $$ +BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_CATALOG=current_database() + AND TABLE_SCHEMA=current_schema() + AND TABLE_NAME='t_ds_process_instance' + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_process_instance DROP COLUMN worker_group_id; + END IF; +END; +$$ LANGUAGE plpgsql; +d// +delimiter ; +select dc_dolphin_T_t_ds_process_instance_D_worker_group_id(); +DROP FUNCTION dc_dolphin_T_t_ds_process_instance_D_worker_group_id(); + -- ac_dolphin_T_t_ds_task_instance_A_worker_group delimiter ; @@ -75,9 +96,30 @@ delimiter ; select ac_dolphin_T_t_ds_task_instance_A_worker_group(); DROP FUNCTION ac_dolphin_T_t_ds_task_instance_A_worker_group(); --- ac_dolphin_T_t_ds_process_instance_A_worker_group +-- dc_dolphin_T_t_ds_task_instance_D_worker_group_id delimiter ; -DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_process_instance_A_worker_group(); +DROP FUNCTION IF EXISTS dc_dolphin_T_t_ds_task_instance_D_worker_group_id(); +delimiter d// +CREATE FUNCTION dc_dolphin_T_t_ds_task_instance_D_worker_group_id() RETURNS void AS $$ +BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_CATALOG=current_database() + AND TABLE_SCHEMA=current_schema() + AND TABLE_NAME='t_ds_task_instance' + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_task_instance DROP COLUMN worker_group_id; + END IF; +END; +$$ LANGUAGE plpgsql; +d// +delimiter ; +select dc_dolphin_T_t_ds_task_instance_D_worker_group_id(); +DROP FUNCTION dc_dolphin_T_t_ds_task_instance_D_worker_group_id(); + +-- ac_dolphin_T_t_ds_schedules_A_worker_group +delimiter ; +DROP FUNCTION IF EXISTS ac_dolphin_T_t_ds_schedules_A_worker_group(); delimiter d// CREATE FUNCTION ac_dolphin_T_t_ds_schedules_A_worker_group() RETURNS void AS $$ BEGIN @@ -96,3 +138,24 @@ delimiter ; select ac_dolphin_T_t_ds_schedules_A_worker_group(); DROP FUNCTION ac_dolphin_T_t_ds_schedules_A_worker_group(); +-- dc_dolphin_T_t_ds_schedules_D_worker_group_id +delimiter ; +DROP FUNCTION IF EXISTS dc_dolphin_T_t_ds_schedules_D_worker_group_id(); +delimiter d// +CREATE FUNCTION dc_dolphin_T_t_ds_schedules_D_worker_group_id() RETURNS void AS $$ +BEGIN + IF EXISTS (SELECT 1 FROM information_schema.COLUMNS + WHERE TABLE_CATALOG=current_database() + AND TABLE_SCHEMA=current_schema() + AND TABLE_NAME='t_ds_schedules' + AND COLUMN_NAME ='worker_group_id') + THEN + ALTER TABLE t_ds_schedules DROP COLUMN worker_group_id; + END IF; +END; +$$ LANGUAGE plpgsql; +d// +delimiter ; +select dc_dolphin_T_t_ds_schedules_D_worker_group_id(); +DROP FUNCTION dc_dolphin_T_t_ds_schedules_D_worker_group_id(); +