diff --git a/db/update17.5.sql b/db/update17.5.sql index 8b3f2aafd5..925889dfce 100644 --- a/db/update17.5.sql +++ b/db/update17.5.sql @@ -262,5 +262,3 @@ UPDATE `zt_grouppriv` SET `module` = 'product' WHERE `module` = 'story' and `met ALTER TABLE `zt_job` ADD `lastSyncDate` datetime DEFAULT NULL AFTER `lastTag`; INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('*/5', '*', '*', '*', '*', 'moduleName=compile&methodName=syncCompile', '定时同步构建记录', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); - -ALTER TABLE `zt_repofiles` ADD `oldPath` varchar(255) DEFAULT '' AFTER `path`; diff --git a/db/update17.8.sql b/db/update17.8.sql index facd98b749..e3678e9eec 100644 --- a/db/update17.8.sql +++ b/db/update17.8.sql @@ -7,7 +7,7 @@ ALTER TABLE `zt_release` CHANGE `branch` `branch` varchar(255) NOT NULL; ALTER TABLE `zt_release` CHANGE `build` `build` varchar(255) NOT NULL; ALTER TABLE `zt_release` ADD `shadow` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `branch`; -ALTER TABLE `zt_host` +ALTER TABLE `zt_host` DROP COLUMN `cabinet`, DROP COLUMN `cpuRate`, DROP COLUMN `diskType`, @@ -56,7 +56,7 @@ CHANGE COLUMN `privateIP` `intranet` varchar(128) NOT NULL AFTER `cpuCores`, CHANGE COLUMN `publicIP` `extranet` varchar(128) NOT NULL AFTER `intranet`; UPDATE zt_host h, -zt_asset a +zt_asset a SET h.`name` = a.`name`, h.`createdBy` = a.`createdBy`, h.`createdDate` = a.`createdDate`, @@ -130,3 +130,5 @@ ALTER TABLE `zt_build` ADD `builds` varchar(255) NOT NULL AFTER `execution`; UPDATE `zt_block` SET block = 'scrumrisk' WHERE module = 'project' AND type = 'scrum' AND block = 'waterfallrisk'; UPDATE `zt_block` SET block = 'scrumissue' WHERE module = 'project' AND type = 'scrum' AND block = 'waterfallissue'; + +ALTER TABLE `zt_repofiles` ADD `oldPath` varchar(255) DEFAULT '' AFTER `path`;