From e893c7f6c38cca5891a8d64a71404abf97194e6c Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Thu, 4 Nov 2021 15:42:39 +0800
Subject: [PATCH] * Add upgrade sql.

---
 db/update15.7.1.sql      | 6 ++++++
 db/zentao.sql            | 5 +++++
 module/upgrade/model.php | 4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 db/update15.7.1.sql

diff --git a/db/update15.7.1.sql b/db/update15.7.1.sql
new file mode 100644
index 0000000000..2f3096c979
--- /dev/null
+++ b/db/update15.7.1.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `zt_branch` ADD `default` enum ('0', '1') NOT NULL DEFAULT '0' AFTER `name`;
+ALTER TABLE `zt_branch` ADD `status` enum ('active', 'closed') NOT NULL DEFAULT 'active' AFTER `default`;
+ALTER TABLE `zt_branch` ADD `desc` varchar(255) NOT NULL AFTER `status`;
+ALTER TABLE `zt_branch` ADD `createdDate` date NOT NULL AFTER `desc`;
+ALTER TABLE `zt_branch` ADD `closedDate` date NOT NULL AFTER `createdDate`;
+ALTER TABLE `zt_projectproduct` ADD PRIMARY KEY `project_product_branch` (`project`, `product`, `branch`), DROP INDEX `PRIMARY`;
diff --git a/db/zentao.sql b/db/zentao.sql
index fd9f4acb5a..0501dc8774 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -147,6 +147,11 @@ CREATE TABLE IF NOT EXISTS `zt_branch` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
   `product` mediumint(8) unsigned NOT NULL,
   `name` varchar(255) NOT NULL,
+  `default` enum ('0', '1') NOT NULL DEFAULT '0'
+  `status` enum ('active', 'closed') NOT NULL DEFAULT 'active'
+  `desc` varchar(255) NOT NULL,
+  `createdDate` date NOT NULL,
+  `closedDate` date NOT NULL,
   `order` smallint unsigned NOT NULL,
   `deleted` enum('0','1') NOT NULL DEFAULT '0',
   PRIMARY KEY  (`id`),
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 58f24fc594..38cd4fbe09 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -729,6 +729,10 @@ class upgradeModel extends model
             $this->saveLogs('Execute 15_7');
             $this->execSQL($this->getUpgradeFile('15.7'));
             $this->appendExec('15_7');
+        case '15_7_1':
+            $this->saveLogs('Execute 15_7_1');
+            $this->execSQL($this->getUpgradeFile('15.7.1'));
+            $this->appendExec('15_7_1');
         }
 
         $this->deletePatch();