From 7ad02685c2a5480d82a210e4a2cbd14b0c20fb61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Mon, 17 Apr 2023 03:12:13 +0000
Subject: [PATCH] * Fix bug#34105.

---
 db/update18.3.sql |  9 +++++++++
 db/zentao.sql     | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/db/update18.3.sql b/db/update18.3.sql
index fe305d6bfc..ccaebb8d5b 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -378,6 +378,11 @@ CHANGE `closedDate` `closedDate` datetime NULL,
 CHANGE `lastEditedDate` `lastEditedDate` datetime NULL;
 
 ALTER TABLE `zt_build`
+CHANGE `scmPath` `scmPath` char(255) NOT NULL DEFAULT '',
+CHANGE `filePath` `filePath` char(255) NOT NULL DEFAULT '',
+CHANGE `stories` `stories` text NULL,
+CHANGE `bugs` `bugs` text NULL,
+CHANGE `desc` `desc` mediumtext NULL,
 CHANGE `project` `project` mediumint unsigned NOT NULL DEFAULT '0';
 
 ALTER TABLE `zt_case`
@@ -710,6 +715,10 @@ CHANGE `team` `team` varchar(90) NOT NULL DEFAULT '',
 CHANGE `whitelist` `whitelist` text NULL,
 CHANGE `order` `order` mediumint unsigned NOT NULL DEFAULT '0';
 
+ALTER TABLE `zt_release`
+CHANGE `project` `project` varchar(255) NOT NULL DEFAULT '0',
+CHANGE `leftBugs` `leftBugs` text NULL;
+
 ALTER TABLE `zt_researchplan`
 CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
 CHANGE `editedDate` `editedDate` datetime NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index ed35abe5ae..017e361eff 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -329,13 +329,13 @@ CREATE TABLE IF NOT EXISTS `zt_build` (
   `execution` mediumint(8) unsigned NOT NULL default '0',
   `builds` varchar(255) NOT NULL,
   `name` char(150) NOT NULL,
-  `scmPath` char(255) NOT NULL,
-  `filePath` char(255) NOT NULL,
+  `scmPath` char(255) NOT NULL DEFAULT '',
+  `filePath` char(255) NOT NULL DEFAULT '',
   `date` date NOT NULL,
-  `stories` text NOT NULL,
-  `bugs` text NOT NULL,
+  `stories` text NULL,
+  `bugs` text NULL,
   `builder` char(30) NOT NULL default '',
-  `desc` mediumtext NOT NULL,
+  `desc` mediumtext NULL,
   `createdBy` varchar(30) NOT NULL,
   `createdDate` datetime NOT NULL,
   `deleted` enum('0','1') NOT NULL default '0',
@@ -1396,7 +1396,7 @@ CREATE UNIQUE INDEX `relation` ON `zt_relation`(`product`,`relation`,`AType`,`BT
 -- DROP TABLE IF EXISTS `zt_release`;
 CREATE TABLE IF NOT EXISTS `zt_release` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
-  `project` varchar(255) NOT NULL,
+  `project` varchar(255) NOT NULL default '0',
   `product` mediumint(8) unsigned NOT NULL default '0',
   `branch` varchar(255) NOT NULL default '0',
   `shadow` mediumint(8) unsigned NOT NULL default '0',
@@ -1406,7 +1406,7 @@ CREATE TABLE IF NOT EXISTS `zt_release` (
   `date` date NOT NULL,
   `stories` text NOT NULL,
   `bugs` text NOT NULL,
-  `leftBugs` text NOT NULL,
+  `leftBugs` text NULL,
   `desc` mediumtext NOT NULL,
   `mailto` text,
   `notify` varchar(255),