From 48d6d90734411eca6dcd6806d6270ea4e42bcff6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 5 Aug 2024 13:47:54 +0800 Subject: [PATCH] * [bug#52926,done,1h] fix install error under the dameng database. --- db/update20.2.0.sql | 2 +- db/zentao.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/update20.2.0.sql b/db/update20.2.0.sql index 3af7cf1c0c..acc392bf5f 100644 --- a/db/update20.2.0.sql +++ b/db/update20.2.0.sql @@ -13,7 +13,7 @@ UPDATE `zt_workflowaction` SET conditions = '' WHERE `action` = 'approvalreview' UPDATE `zt_workflowaction` SET conditions = '' WHERE `action` = 'approvalcancel' AND `conditions` = '[{"conditionType":"data","fields":[{"field":"deleted","operator":"equal","param":"0","logicalOperator":"and"},{"field":"reviewStatus","operator":"equal","param":"doing","logicalOperator":"and"},{"field":"openedBy","operator":"equal","param":"currentUser"}]}]'; UPDATE `zt_workflowaction` SET conditions = '' WHERE `action` = 'approvalsubmit' AND `conditions` = '[{"conditionType":"data","fields":[{"field":"deleted","operator":"equal","param":"0","logicalOperator":"and"},{"field":"reviewStatus","operator":"equal","param":"wait","logicalOperator":"and"},{"field":"openedBy","operator":"equal","param":"currentUser"}]},{"conditionType":"data","fields":[{"field":"deleted","operator":"equal","param":"0","logicalOperator":"and"},{"field":"reviewStatus","operator":"equal","param":"reject","logicalOperator":"and"},{"field":"openedBy","operator":"equal","param":"currentUser"}]}]'; -ALTER TABLE `zt_job` ADD INDEX `idx_repo_deleted`(`repo`,`deleted`); +CREATE INDEX `idx_repo_deleted` ON `zt_job` (`repo`,`deleted`); UPDATE `zt_workflowfield` SET options = '{"wait":"\\u5f85\\u5ba1\\u6279","doing":"\\u5ba1\\u6279\\u4e2d","pass":"\\u901a\\u8fc7","reject":"\\u4e0d\\u901a\\u8fc7","reverting":"\\u56de\\u9000\\u4e2d"}' WHERE field = 'reviewStatus'; diff --git a/db/zentao.sql b/db/zentao.sql index 2ff6a55c3e..4045c4adab 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -16696,4 +16696,4 @@ UPDATE `zt_pivot` SET `editedBy` = 'system' where `editedBy` = 'admin'; INSERT INTO `zt_config` ( `vision`, `owner`, `module`, `section`, `key`, `value` ) VALUES ('', 'system', 'common', '', 'closedFeatures', 'otherOA'); INSERT INTO `zt_config`(`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES ('', 'system', 'common', 'global', 'installedDate', CURDATE()); -ALTER TABLE `zt_job` ADD INDEX `idx_repo_deleted`(`repo`,`deleted`); +CREATE INDEX `idx_repo_deleted` ON `zt_job` (`repo`,`deleted`);