You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/06/15 15:21:46 UTC
[incubator-dolphinscheduler] branch dev updated:
[Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x -
5.64 (#2911)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new f7ea4f1 [Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x - 5.64 (#2911)
f7ea4f1 is described below
commit f7ea4f19788f3c758aea6e2662d07f0ce99ba01d
Author: Yichao Yang <10...@qq.com>
AuthorDate: Mon Jun 15 23:21:33 2020 +0800
[Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x - 5.64 (#2911)
Co-authored-by: dailidong <da...@gmail.com>
---
sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql | 4 ++--
sql/dolphinscheduler_mysql.sql | 4 ++--
sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_ddl.sql | 10 +++++-----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
index dad81b1..ac0851a 100644
--- a/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql
@@ -193,8 +193,8 @@ CREATE TABLE `t_escheduler_project` (
`desc` varchar(200) DEFAULT NULL COMMENT 'project description',
`user_id` int(11) DEFAULT NULL COMMENT 'creator id',
`flag` tinyint(4) DEFAULT '1' COMMENT '0 not available, 1 available',
- `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
- `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'update time',
+ `create_time` datetime DEFAULT NULL COMMENT 'create time',
+ `update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`),
KEY `user_id_index` (`user_id`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 93b36b4..a8fcc51 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -479,8 +479,8 @@ CREATE TABLE `t_ds_project` (
`description` varchar(200) DEFAULT NULL,
`user_id` int(11) DEFAULT NULL COMMENT 'creator id',
`flag` tinyint(4) DEFAULT '1' COMMENT '0 not available, 1 available',
- `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'create time',
- `update_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT 'update time',
+ `create_time` datetime DEFAULT NULL COMMENT 'create time',
+ `update_time` datetime DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`),
KEY `user_id_index` (`user_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
diff --git a/sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_ddl.sql b/sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_ddl.sql
index aad87b1..4572a0f 100644
--- a/sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_ddl.sql
+++ b/sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_ddl.sql
@@ -97,9 +97,9 @@ CREATE PROCEDURE ac_escheduler_T_t_escheduler_error_command()
`failure_strategy` tinyint(4) NULL DEFAULT 0 COMMENT 'failure strategy',
`warning_type` tinyint(4) NULL DEFAULT 0 COMMENT 'warning type',
`warning_group_id` int(11) NULL DEFAULT NULL COMMENT 'warning group id',
- `schedule_time` datetime(0) NULL DEFAULT NULL COMMENT 'scheduler time',
- `start_time` datetime(0) NULL DEFAULT NULL COMMENT 'start time',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT 'update time',
+ `schedule_time` datetime NULL DEFAULT NULL COMMENT 'scheduler time',
+ `start_time` datetime NULL DEFAULT NULL COMMENT 'start time',
+ `update_time` datetime NULL DEFAULT NULL COMMENT 'update time',
`dependence` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'dependence',
`process_instance_priority` int(11) NULL DEFAULT NULL COMMENT 'process instance priority, 0 Highest,1 High,2 Medium,3 Low,4 Lowest',
`worker_group_id` int(11) NULL DEFAULT -1 COMMENT 'worker group id',
@@ -125,8 +125,8 @@ CREATE PROCEDURE ac_escheduler_T_t_escheduler_worker_group()
`id` bigint(11) NOT NULL AUTO_INCREMENT COMMENT 'id',
`name` varchar(256) NULL DEFAULT NULL COMMENT 'worker group name',
`ip_list` varchar(256) NULL DEFAULT NULL COMMENT 'worker ip list. split by [,] ',
- `create_time` datetime(0) NULL DEFAULT NULL COMMENT 'create time',
- `update_time` datetime(0) NULL DEFAULT NULL COMMENT 'update time',
+ `create_time` datetime NULL DEFAULT NULL COMMENT 'create time',
+ `update_time` datetime NULL DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT=1 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;