From d96a77e3140b0ea9c100ebffc1953d4c64d18293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E9=87=91=E5=8B=87?= <zhujinyong@cnezsoft.com>
Date: Tue, 18 Apr 2023 04:31:10 +0000
Subject: [PATCH] * Fix bug#34233.

---
 db/update18.3.sql | 6 ++++++
 db/zentao.sql     | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/db/update18.3.sql b/db/update18.3.sql
index cf9c51a501..f6efd25a12 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -738,6 +738,12 @@ 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_relation`
+CHANGE `project` `project` mediumint NOT NULL DEFAULT '0',
+CHANGE `product` `product` mediumint NOT NULL DEFAULT '0',
+CHANGE `execution` `execution` mediumint NOT NULL DEFAULT '0',
+CHANGE `extra` `extra` char(30) NOT NULL DEFAULT '';
+
 ALTER TABLE `zt_release`
 CHANGE `project` `project` varchar(255) NOT NULL DEFAULT '0',
 CHANGE `leftBugs` `leftBugs` text NULL;
diff --git a/db/zentao.sql b/db/zentao.sql
index 597de86cd7..b976da3927 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -1379,9 +1379,9 @@ CREATE UNIQUE INDEX `project` ON `zt_projectstory`(`project`,`story`);
 -- DROP TABLE IF EXISTS `zt_relation`;
 CREATE TABLE IF NOT EXISTS `zt_relation` (
   `id` int(8) NOT NULL AUTO_INCREMENT,
-  `project` mediumint(8) NOT NULL,
-  `product` mediumint(8) NOT NULL,
-  `execution` mediumint(8) NOT NULL,
+  `project` mediumint(8) NOT NULL DEFAULT '0',
+  `product` mediumint(8) NOT NULL DEFAULT '0',
+  `execution` mediumint(8) NOT NULL DEFAULT '0',
   `AType` char(30) NOT NULL,
   `AID` mediumint(8) NOT NULL,
   `AVersion` char(30) NOT NULL,
@@ -1389,7 +1389,7 @@ CREATE TABLE IF NOT EXISTS `zt_relation` (
   `BType` char(30) NOT NULL,
   `BID` mediumint(8) NOT NULL,
   `BVersion` char(30) NOT NULL,
-  `extra` char(30) NOT NULL,
+  `extra` char(30) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
 ) ENGINE='InnoDB' DEFAULT CHARSET=utf8;
 CREATE UNIQUE INDEX `relation` ON `zt_relation`(`product`,`relation`,`AType`,`BType`, `AID`, `BID`);