From bcb5137abea90e5f0e99005eed510ec6c8ffdd12 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 9 May 2018 14:40:50 +0800 Subject: [PATCH] * Move update sql to 10.0.beta. --- db/update10.0.beta.sql | 2 ++ db/update9.8.1.sql | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/db/update10.0.beta.sql b/db/update10.0.beta.sql index eb64935fcf..6c07ea7c58 100644 --- a/db/update10.0.beta.sql +++ b/db/update10.0.beta.sql @@ -1,3 +1,5 @@ ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`; ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`; ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`; +ALTER TABLE `zt_doclib` ADD `collector` text NOT NULL AFTER `main`; +ALTER TABLE `zt_module` ADD `collector` text NOT NULL AFTER `owner`; diff --git a/db/update9.8.1.sql b/db/update9.8.1.sql index 458c23678a..e7a898c015 100644 --- a/db/update9.8.1.sql +++ b/db/update9.8.1.sql @@ -1,9 +1,4 @@ <<<<<<< HEAD -ALTER TABLE `zt_release` ADD `marker` enum('0','1') NOT NULL default '0' AFTER `name`; -ALTER TABLE `zt_doc` ADD `collector` text NOT NULL AFTER `views`; -ALTER TABLE `zt_doc` ADD `visitedDate` datetime NOT NULL AFTER `editedDate`; -ALTER TABLE `zt_doclib` ADD `collector` text NOT NULL AFTER `main`; -ALTER TABLE `zt_module` ADD `collector` text NOT NULL AFTER `owner`; ======= ALTER TABLE `zt_user` CHANGE `realname` `realname` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `password`; ALTER TABLE `zt_project` CHANGE `openedDate` `openedDate` datetime NOT NULL,