From ff6b122f3a7120a0a22e91f107dd487a69693c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Mon, 10 Jan 2022 16:46:02 +0800
Subject: [PATCH] * Add upgrade.sql.

---
 db/update16.1.sql | 15 +++++++++++++++
 db/zentao.sql     | 15 +++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 db/update16.1.sql

diff --git a/db/update16.1.sql b/db/update16.1.sql
new file mode 100644
index 0000000000..a517a5fed2
--- /dev/null
+++ b/db/update16.1.sql
@@ -0,0 +1,15 @@
+CREATE TABLE `zt_cardgroup` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `kanban` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(8) NOT NULL,
+  `lane` mediumint(8) NOT NULL,
+  `column` mediumint(8) NOT NULL,
+  `order` mediumint(8) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `card_group` (`kanban`,`objectType`,`objectID`,`lane`,`column`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `zt_kanban` ADD `displayCards` smallint(6) NOT NULL AFTER `order`;
+ALTER TABLE `zt_kanbancard` DROP COLUMN `lane`;
+ALTER TABLE `zt_kanbancard` DROP COLUMN `column`;
diff --git a/db/zentao.sql b/db/zentao.sql
index c733278613..f94d97aa5c 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -677,6 +677,7 @@ CREATE TABLE `zt_kanban` (
   `archived` enum('0', '1') NOT NULL DEFAULT '0',
   `status` enum('active','closed') NOT NULL default 'active',
   `order` mediumint(8) NOT NULL DEFAULT '0',
+  `displayCards` smallint(6) NOT NULL,
   `createdBy` char(30) NOT NULL,
   `createdDate` datetime NOT NULL,
   `lastEditedBy` char(30) NOT NULL,
@@ -706,8 +707,6 @@ CREATE TABLE `zt_kanbancard` (
   `kanban` mediumint(8) unsigned NOT NULL,
   `region` mediumint(8) unsigned NOT NULL,
   `group` mediumint(8) unsigned NOT NULL,
-  `lane` mediumint(8) unsigned NOT NULL,
-  `column` mediumint(8) unsigned NOT NULL,
   `name` varchar(255) NOT NULL,
   `pri` mediumint(8) unsigned NOT NULL,
   `assignedTo` text NOT NULL,
@@ -731,6 +730,18 @@ CREATE TABLE `zt_kanbancard` (
   `deleted` enum('0', '1') NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_kanbancardgroup`;
+CREATE TABLE `zt_cardgroup` (
+  `id` int(8) NOT NULL AUTO_INCREMENT,
+  `kanban` mediumint(8) NOT NULL,
+  `objectType` char(30) NOT NULL,
+  `objectID` mediumint(8) NOT NULL,
+  `lane` mediumint(8) NOT NULL,
+  `column` mediumint(8) NOT NULL,
+  `order` mediumint(8) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `card_group` (`kanban`,`objectType`,`objectID`,`lane`,`column`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_kanbangroup`;
 CREATE TABLE `zt_kanbangroup` (
   `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,