From b6453da298bff491b02a3b690674dc62bcb84cd3 Mon Sep 17 00:00:00 2001
From: mrproliu <741550557@qq.com>
Date: Thu, 15 Apr 2021 20:15:20 +0800
Subject: [PATCH] Remove useless table fields (#5284)

Co-authored-by: dalekliuhan <dalekliuhan@didiglobal.com>
---
 .../org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml  | 2 +-
 sql/dolphinscheduler_mysql.sql                                | 2 --
 sql/dolphinscheduler_postgre.sql                              | 2 --
 sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql       | 4 ++++
 sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql  | 4 ++++
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
index ba93e9cf26..5f06b25e88 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml
@@ -20,7 +20,7 @@
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.CommandMapper">
     <select id="getOneToRun" resultType="org.apache.dolphinscheduler.dao.entity.Command">
         select cmd.id, cmd.command_type, cmd.process_definition_id, cmd.command_param, cmd.task_depend_type, cmd.failure_strategy,
-        cmd.warning_type, cmd.warning_group_id, cmd.schedule_time, cmd.start_time, cmd.executor_id, cmd.dependence, cmd.update_time,
+        cmd.warning_type, cmd.warning_group_id, cmd.schedule_time, cmd.start_time, cmd.executor_id, cmd.update_time,
         cmd.process_instance_priority, cmd.worker_group
         from t_ds_command cmd
         join t_ds_process_definition definition on cmd.process_definition_id = definition.id
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 3218223ccc..b479a5e030 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -327,7 +327,6 @@ CREATE TABLE `t_ds_command` (
   `schedule_time` datetime DEFAULT NULL COMMENT 'schedule time',
   `start_time` datetime DEFAULT NULL COMMENT 'start time',
   `executor_id` int(11) DEFAULT NULL COMMENT 'executor id',
-  `dependence` varchar(255) DEFAULT NULL COMMENT 'dependence',
   `update_time` datetime DEFAULT NULL COMMENT 'update time',
   `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority: 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
   `worker_group` varchar(64)  COMMENT 'worker group',
@@ -375,7 +374,6 @@ CREATE TABLE `t_ds_error_command` (
   `schedule_time` datetime DEFAULT NULL COMMENT 'scheduler time',
   `start_time` datetime DEFAULT NULL COMMENT 'start time',
   `update_time` datetime DEFAULT NULL COMMENT 'update time',
-  `dependence` text COMMENT 'dependence',
   `process_instance_priority` int(11) DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
   `worker_group` varchar(64)  COMMENT 'worker group',
   `message` text COMMENT 'message',
diff --git a/sql/dolphinscheduler_postgre.sql b/sql/dolphinscheduler_postgre.sql
index 0193e577b3..22737f7696 100644
--- a/sql/dolphinscheduler_postgre.sql
+++ b/sql/dolphinscheduler_postgre.sql
@@ -228,7 +228,6 @@ CREATE TABLE t_ds_command (
   schedule_time timestamp DEFAULT NULL ,
   start_time timestamp DEFAULT NULL ,
   executor_id int DEFAULT NULL ,
-  dependence varchar(255) DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
   process_instance_priority int DEFAULT NULL ,
   worker_group varchar(64),
@@ -270,7 +269,6 @@ CREATE TABLE t_ds_error_command (
   schedule_time timestamp DEFAULT NULL ,
   start_time timestamp DEFAULT NULL ,
   update_time timestamp DEFAULT NULL ,
-  dependence text ,
   process_instance_priority int DEFAULT NULL ,
   worker_group varchar(64),
   message text ,
diff --git a/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql b/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
index 7fdac0728f..148ca33e58 100644
--- a/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.4.0_schema/mysql/dolphinscheduler_ddl.sql
@@ -290,3 +290,7 @@ DROP PROCEDURE uc_dolphin_T_t_ds_alertgroup_A_create_user_id;
 -- ALTER TABLE t_ds_process_definition_version DROP `receivers`, DROP `receivers_cc`;
 
 -- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup;
+
+-- ALTER TABLE t_ds_command DROP `dependence`;
+
+-- ALTER TABLE t_ds_error_command DROP `dependence`;
diff --git a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
index 390556b094..882bd05bd2 100644
--- a/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.4.0_schema/postgresql/dolphinscheduler_ddl.sql
@@ -281,3 +281,7 @@ DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_alertgroup_A_create_user_id();
 -- ALTER TABLE t_ds_process_definition_version DROP COLUMN "receivers", DROP COLUMN "receivers_cc";
 
 -- DROP TABLE IF EXISTS t_ds_relation_user_alertgroup;
+
+-- ALTER TABLE t_ds_command DROP COLUMN "dependence";
+
+-- ALTER TABLE t_ds_error_command DROP COLUMN "dependence";
\ No newline at end of file