Browse Source

Feature add user state (#2710)

* feature: #1923

* fix:docker sql script add column

* fix: update sql script

* fix: UT bug

* fix: UT bug

* fix: UT bug

* fix: e2e UT bug

* fix: e2e button location

* fix:sql init script to add t_ds_user.state column

Co-authored-by: Rubik-W <whm_777@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
pull/3/MERGE
Rubik-W 4 years ago committed by GitHub
parent
commit
a7aa58e6ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      sql/dolphinscheduler-postgre.sql
  2. 2
      sql/dolphinscheduler_mysql.sql
  3. 1
      sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_ddl.sql

3
sql/dolphinscheduler-postgre.sql

@ -627,6 +627,7 @@ CREATE TABLE t_ds_user (
state int DEFAULT 1 , state int DEFAULT 1 ,
PRIMARY KEY (id) PRIMARY KEY (id)
); );
comment on column t_ds_user.state is 'state 0:disable 1:enable';
-- --
-- Table structure for table t_ds_version -- Table structure for table t_ds_version
@ -751,7 +752,7 @@ ALTER TABLE t_ds_worker_server ALTER COLUMN id SET DEFAULT NEXTVAL('t_ds_worker_
-- Records of t_ds_user?user : admin , password : dolphinscheduler123 -- Records of t_ds_user?user : admin , password : dolphinscheduler123
INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22'); INSERT INTO t_ds_user(user_name,user_password,user_type,email,phone,tenant_id,state,create_time,update_time) VALUES ('admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', 1, '2018-03-27 15:48:50', '2018-10-24 17:40:22');
-- Records of t_ds_alertgroup,dolphinscheduler warning group -- Records of t_ds_alertgroup,dolphinscheduler warning group
INSERT INTO t_ds_alertgroup(group_name,group_type,description,create_time,update_time) VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning group','2018-11-29 10:20:39', '2018-11-29 10:20:39'); INSERT INTO t_ds_alertgroup(group_name,group_type,description,create_time,update_time) VALUES ('dolphinscheduler warning group', '0', 'dolphinscheduler warning group','2018-11-29 10:20:39', '2018-11-29 10:20:39');

2
sql/dolphinscheduler_mysql.sql

@ -815,4 +815,4 @@ INSERT INTO `t_ds_relation_user_alertgroup` VALUES ('1', '1', '1', '2018-11-29 1
-- ---------------------------- -- ----------------------------
-- Records of t_ds_user -- Records of t_ds_user
-- ---------------------------- -- ----------------------------
INSERT INTO `t_ds_user` VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22', null,1); INSERT INTO `t_ds_user` VALUES ('1', 'admin', '7ad2410b2f4c074479a8937a28a22b8f', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22', null, 1);

1
sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_ddl.sql

@ -296,6 +296,7 @@ BEGIN
AND COLUMN_NAME ='state') AND COLUMN_NAME ='state')
THEN THEN
ALTER TABLE t_ds_user ADD COLUMN state int DEFAULT 1; ALTER TABLE t_ds_user ADD COLUMN state int DEFAULT 1;
comment on column t_ds_user.state is 'state 0:disable 1:enable';
END IF; END IF;
END; END;
$$ LANGUAGE plpgsql; $$ LANGUAGE plpgsql;

Loading…
Cancel
Save