This is an automated email from the ASF dual-hosted git repository.
lgcareer 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 f784ce5 [Fix-3256][ui] Fix admin user info update error (#3425)
f784ce5 is described below
commit f784ce504f06d8a6b444a98ead01c6aa8b184679
Author: wuchunfu <[email protected]>
AuthorDate: Fri Aug 7 10:20:56 2020 +0800
[Fix-3256][ui] Fix admin user info update error (#3425)
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [PROPOSAL-3139] Datasource selection changes from radio to select
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [BUG FIX] issues #3256
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* [Fix-3256][ui] Fix admin user info update error
* reset createUser.vue
* [Fix-3256][ui] Fix admin user info update error
Co-authored-by: dailidong <[email protected]>
---
sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql | 3 ++-
sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_dml.sql | 3 ++-
sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
index 6aeafcd..e2a0875 100644
--- a/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/upgrade/1.2.0_schema/mysql/dolphinscheduler_dml.sql
@@ -22,4 +22,5 @@ UPDATE QRTZ_FIRED_TRIGGERS SET SCHED_NAME='DolphinScheduler'
WHERE SCHED_NAME='E
UPDATE QRTZ_JOB_DETAILS SET SCHED_NAME='DolphinScheduler' WHERE
SCHED_NAME='EasyScheduler';
UPDATE QRTZ_JOB_DETAILS SET
JOB_CLASS_NAME='org.apache.dolphinscheduler.dao.quartz.ProcessScheduleJob'
WHERE JOB_CLASS_NAME='cn.escheduler.server.quartz.ProcessScheduleJob';
UPDATE QRTZ_LOCKS SET SCHED_NAME='DolphinScheduler' WHERE
SCHED_NAME='EasyScheduler';
-UPDATE QRTZ_SCHEDULER_STATE SET SCHED_NAME='DolphinScheduler' WHERE
SCHED_NAME='EasyScheduler';
\ No newline at end of file
+UPDATE QRTZ_SCHEDULER_STATE SET SCHED_NAME='DolphinScheduler' WHERE
SCHED_NAME='EasyScheduler';
+UPDATE t_ds_user SET phone = '' WHERE phone = 'xx';
\ No newline at end of file
diff --git a/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_dml.sql
b/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_dml.sql
index 6f0e145..661ed9e 100644
--- a/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_dml.sql
+++ b/sql/upgrade/1.3.0_schema/mysql/dolphinscheduler_dml.sql
@@ -23,4 +23,5 @@ UPDATE t_ds_process_instance instance SET
`worker_group`=IFNULL((SELECT name fro
UPDATE t_ds_task_instance instance SET `worker_group`=IFNULL((SELECT name from
t_ds_worker_group WHERE instance.worker_group=CONCAT(id,'')),'default');
UPDATE t_ds_schedules schedule SET `worker_group`=IFNULL((SELECT name from
t_ds_worker_group WHERE schedule.worker_group=CONCAT(id,'')),'default');
UPDATE t_ds_command command SET `worker_group`=IFNULL((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
-UPDATE t_ds_error_command command SET `worker_group`=IFNULL((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
\ No newline at end of file
+UPDATE t_ds_error_command command SET `worker_group`=IFNULL((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
+UPDATE t_ds_user SET phone = '' WHERE phone = 'xx';
\ No newline at end of file
diff --git a/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql
b/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql
index fba0315..a748eae 100644
--- a/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql
+++ b/sql/upgrade/1.3.0_schema/postgresql/dolphinscheduler_dml.sql
@@ -21,4 +21,5 @@ UPDATE t_ds_process_instance instance SET
worker_group=COALESCE((SELECT name fro
UPDATE t_ds_task_instance instance SET worker_group=COALESCE((SELECT name from
t_ds_worker_group WHERE instance.worker_group=CONCAT(id,'')),'default');
UPDATE t_ds_schedules schedule SET worker_group=COALESCE((SELECT name from
t_ds_worker_group WHERE schedule.worker_group=CONCAT(id,'')),'default');
UPDATE t_ds_command command SET worker_group=COALESCE((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
-UPDATE t_ds_error_command command SET worker_group=COALESCE((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
\ No newline at end of file
+UPDATE t_ds_error_command command SET worker_group=COALESCE((SELECT name from
t_ds_worker_group WHERE command.worker_group=CONCAT(id,'')),'default');
+UPDATE t_ds_user SET phone = '' WHERE phone = 'xx';
\ No newline at end of file