Reduce the jobset cols on the remaining two queries

This commit is contained in:
Graham Christensen 2022-03-19 23:24:28 -04:00
parent f353a7ac41
commit 137be3452e

View file

@ -138,7 +138,14 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
{ id => { -in => $db->resultset('JobsetEvalMembers')->search({ eval => { -in => [@evals] } }, { select => "build" })->as_query }
, finished => 1
},
{ order_by => ["job", "id"], columns => [ @columns ] });
{
order_by => ["job", "id"],
columns => [ @columns ],
join => 'jobset',
'+select' => ['jobset.project', 'jobset.name'],
'+as' => ['jobset.project', 'jobset.name'],
}
);
print STDERR "*** looking for the most recent successful builds of current jobs in ",
$project->name, ":", $jobset->name, "\n";
@ -158,7 +165,13 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
, select => [ { max => 'id', -as => 'm' } ]
})->as_query }
},
{ columns => [ @columns ] });
{
columns => [ @columns ]
join => 'jobset',
'+select' => ['jobset.project', 'jobset.name'],
'+as' => ['jobset.project', 'jobset.name'],
}
);
}
}