From 0fe36bcad51cdf613385ceb814805c3d828a1f5a Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 24 Sep 2024 10:33:41 +0800 Subject: [PATCH] * [task#129207,doing,0.4h] adjust object linked commits sql. --- module/bug/model.php | 4 ++-- module/design/model.php | 4 ++-- module/story/model.php | 4 ++-- module/task/model.php | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 45adca42bb..0365b18b7d 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -2158,8 +2158,8 @@ class bugModel extends model { return $this->dao->select('t1.revision,t3.id AS id,t3.title AS title') ->from(TABLE_REPOHISTORY)->alias('t1') - ->leftJoin(TABLE_RELATION)->alias('t2')->on('t2.relation="completedin" AND t2.BType="commit" AND t2.BID=t1.id') - ->leftJoin(TABLE_BUG)->alias('t3')->on('t2.AType="bug" AND t2.AID=t3.id') + ->leftJoin(TABLE_RELATION)->alias('t2')->on("t2.relation='completedin' AND t2.BType='commit' AND t2.BID=t1.id") + ->leftJoin(TABLE_BUG)->alias('t3')->on("t2.AType='bug' AND t2.AID=t3.id") ->where('t1.revision')->in($revisions) ->andWhere('t1.repo')->eq($repoID) ->andWhere('t3.id')->ne('') diff --git a/module/design/model.php b/module/design/model.php index 7848a54ff3..bc905a6098 100755 --- a/module/design/model.php +++ b/module/design/model.php @@ -430,8 +430,8 @@ class designModel extends model { return $this->dao->select('t1.revision,t3.id AS id,t3.name AS title') ->from(TABLE_REPOHISTORY)->alias('t1') - ->leftJoin(TABLE_RELATION)->alias('t2')->on('t2.relation="completedin" AND t2.BType="commit" AND t2.BID=t1.id') - ->leftJoin(TABLE_DESIGN)->alias('t3')->on('t2.AType="design" AND t2.AID=t3.id') + ->leftJoin(TABLE_RELATION)->alias('t2')->on("t2.relation='completedin' AND t2.BType='commit' AND t2.BID=t1.id") + ->leftJoin(TABLE_DESIGN)->alias('t3')->on("t2.AType='design' AND t2.AID=t3.id") ->where('t1.revision')->in($revisions) ->andWhere('t1.repo')->eq($repoID) ->andWhere('t3.id')->ne('') diff --git a/module/story/model.php b/module/story/model.php index 3e327af477..b2ebc40791 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -5471,8 +5471,8 @@ class storyModel extends model { return $this->dao->select('t1.revision,t3.id AS id,t3.title AS title') ->from(TABLE_REPOHISTORY)->alias('t1') - ->leftJoin(TABLE_RELATION)->alias('t2')->on('t2.relation="completedin" AND t2.BType="commit" AND t2.BID=t1.id') - ->leftJoin(TABLE_STORY)->alias('t3')->on('t2.AType="story" AND t2.AID=t3.id') + ->leftJoin(TABLE_RELATION)->alias('t2')->on("t2.relation='completedin' AND t2.BType='commit' AND t2.BID=t1.id") + ->leftJoin(TABLE_STORY)->alias('t3')->on("t2.AType='story' AND t2.AID=t3.id") ->where('t1.revision')->in($revisions) ->andWhere('t1.repo')->eq($repoID) ->andWhere('t3.id')->ne('') diff --git a/module/task/model.php b/module/task/model.php index 719af38cbc..30fe4634da 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -3335,8 +3335,8 @@ class taskModel extends model { return $this->dao->select('t1.revision,t3.id AS id,t3.name AS name') ->from(TABLE_REPOHISTORY)->alias('t1') - ->leftJoin(TABLE_RELATION)->alias('t2')->on('t2.relation="completedin" AND t2.BType="commit" AND t2.BID=t1.id') - ->leftJoin(TABLE_TASK)->alias('t3')->on('t2.AType="task" AND t2.AID=t3.id') + ->leftJoin(TABLE_RELATION)->alias('t2')->on("t2.relation='completedin' AND t2.BType='commit' AND t2.BID=t1.id") + ->leftJoin(TABLE_TASK)->alias('t3')->on("t2.AType='task' AND t2.AID=t3.id") ->where('t1.revision')->in($revisions) ->andWhere('t1.repo')->eq($repoID) ->andWhere('t3.id')->ne('')