delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Builds: LatestSucceeded*: remove project, jobset references

Browse source
This commit is contained in:
Graham Christensen 2022-01-09 09:46:20 -05:00
parent 5c5ecdb9fc
commit 12ff981d24
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/Hydra/Schema/Result/Builds.pm
View file

@ -584,7 +584,7 @@ sub makeSource {
sub makeQueries { sub makeQueries {
my ($name, $constraint) = @_; my ($name, $constraint) = @_;
my $activeJobs = "(select distinct project, jobset, job, system from Builds where isCurrent = 1 $constraint)"; my $activeJobs = "(select distinct jobset_id, job, system from Builds where isCurrent = 1 $constraint)";
makeSource( makeSource(
"LatestSucceeded$name", "LatestSucceeded$name",
@ -594,7 +594,7 @@ sub makeQueries {
(select (select
(select max(b.id) from builds b (select max(b.id) from builds b
where where
project = activeJobs.project and jobset = activeJobs.jobset jobset_id = activeJobs.jobset_id
and job = activeJobs.job and system = activeJobs.system and job = activeJobs.job and system = activeJobs.system
and finished = 1 and buildstatus = 0 and finished = 1 and buildstatus = 0
) as id ) as id
@ -606,7 +606,7 @@ QUERY
} }
makeQueries('', ""); makeQueries('', "");
makeQueries('ForProject', "and project = ?"); makeQueries('ForProject', "and jobset_id in (select id from jobsets j where j.project = ?)");
makeQueries('ForJobset', "and jobset_id = ?"); makeQueries('ForJobset', "and jobset_id = ?");
makeQueries('ForJob', "and jobset_id = ? and job = ?"); makeQueries('ForJob', "and jobset_id = ? and job = ?");
makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?"); makeQueries('ForJobName', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?");