This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e3482fbe5d [fix-#14918] add missing ddl (#14921)
e3482fbe5d is described below
commit e3482fbe5d8260f14cbe490f1533c373b7548e1c
Author: fuchanghai <[email protected]>
AuthorDate: Mon Sep 18 18:15:48 2023 +0800
[fix-#14918] add missing ddl (#14921)
---
.../3.2.0_schema/mysql/dolphinscheduler_ddl.sql | 72 ++++++++++++++++++++++
.../postgresql/dolphinscheduler_ddl.sql | 10 +++
2 files changed, 82 insertions(+)
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 75a3ec2c3e..d648ff7a4b 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
@@ -16,6 +16,23 @@
*/
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
+DROP PROCEDURE IF EXISTS ut_dolphin_T_t_ds_fav;
+delimiter d//
+CREATE PROCEDURE ut_dolphin_T_t_ds_fav()
+BEGIN
+ IF EXISTS (SELECT 1 FROM information_schema.TABLES
+ WHERE TABLE_NAME='t_ds_fav'
+ AND TABLE_SCHEMA=(SELECT DATABASE()))
+ THEN
+ALTER TABLE t_ds_fav RENAME t_ds_fav_task;
+END IF;
+END;
+d//
+
+delimiter ;
+CALL ut_dolphin_T_t_ds_fav;
+DROP PROCEDURE ut_dolphin_T_t_ds_fav;
+
CREATE TABLE if not exists `t_ds_fav_task`
(
`id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
@@ -24,6 +41,61 @@ CREATE TABLE if not exists `t_ds_fav_task`
PRIMARY KEY (`id`)
) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET = utf8 COLLATE = utf8_bin;
+drop PROCEDURE if EXISTS t_ds_process_definition_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_definition_add_column()
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_process_definition'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME='execution_type')
+ THEN
+ALTER TABLE t_ds_process_definition ADD COLUMN `execution_type` tinyint(4)
DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial
discard,3:serial priority';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_definition_add_column;
+DROP PROCEDURE t_ds_process_definition_add_column;
+
+
+-- t_ds_process_definition_log_add_column
+drop PROCEDURE if EXISTS t_ds_process_definition_log_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_definition_log_add_column()
+BEGIN
+ IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS
+ WHERE TABLE_NAME='t_ds_process_definition_log'
+ AND TABLE_SCHEMA=(SELECT DATABASE())
+ AND COLUMN_NAME='execution_type')
+ THEN
+ALTER TABLE t_ds_process_definition_log ADD COLUMN `execution_type` tinyint(4)
DEFAULT '0' COMMENT 'execution_type 0:parallel,1:serial wait,2:serial
discard,3:serial priority';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_definition_log_add_column;
+DROP PROCEDURE t_ds_process_definition_log_add_column;
+
+
+-- t_ds_process_instance_add_column
+drop PROCEDURE if EXISTS t_ds_process_instance_add_column;
+delimiter d//
+CREATE PROCEDURE t_ds_process_instance_add_column()
+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='next_process_instance_id')
+ THEN
+ALTER TABLE t_ds_process_instance ADD COLUMN `next_process_instance_id`
int(11) DEFAULT '0' COMMENT 'serial queue next processInstanceId';
+END IF;
+END;
+ d//
+ delimiter ;
+CALL t_ds_process_instance_add_column;
+DROP PROCEDURE t_ds_process_instance_add_column;
+
-- uc_dolphin_T_t_ds_command_R_test_flag
drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_command_R_test_flag;
delimiter d//
diff --git
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_ddl.sql
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_ddl.sql
index 70bdfaa23b..9cc6e75f98 100644
---
a/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_ddl.sql
+++
b/dolphinscheduler-dao/src/main/resources/sql/upgrade/3.2.0_schema/postgresql/dolphinscheduler_ddl.sql
@@ -33,12 +33,22 @@ CREATE TABLE IF NOT EXISTS t_ds_relation_sub_workflow (
sub_workflow_instance_id BIGINT NOT NULL,
PRIMARY KEY (id)
);
+
+ALTER TABLE IF EXISTS t_ds_fav RENAME TO t_ds_fav_task;
+
CREATE TABLE if not exists "t_ds_fav_task" (
"id" serial NOT NULL,
"task_type" VARCHAR(64) NOT NULL,
"user_id" integer NOT NULL,
PRIMARY KEY ("id")
);
+
+ALTER TABLE t_ds_process_definition ADD COLUMN IF NOT EXISTS execution_type
int NULL DEFAULT '0';
+
+ALTER TABLE t_ds_process_definition_log ADD COLUMN IF NOT EXISTS
execution_type int NULL DEFAULT '0';
+
+ALTER TABLE t_ds_process_instance ADD COLUMN IF NOT EXISTS
next_process_instance_id int NULL DEFAULT '0';
+
CREATE TABLE if not exists "t_ds_project_preference" (
"id" int NOT NULL,
"code" bigint NOT NULL,
