grahamc/hydra2 - Change VGUFW62F2DVRDMISV7TFO4BWLXKJKINFDVMC52BPZGIF6MSSGJRAC

schema/Builds: use jobset_id instead of jobset name matches

This was clearly an error in the original part-2 of the diff, and specifically breaks when two projects have a jobset of the same name.

Created by Graham Christensen on May 9, 2020

VGUFW62F2DVRDMISV7TFO4BWLXKJKINFDVMC52BPZGIF6MSSGJRAC

Dependencies

In channels

main

Change contents

Replacement in src/lib/Hydra/Controller/Job.pm at line 175 [4.46]

B:BD[3.665] → [2.97:182]

        ->search({}, {bind => [$c->stash->{jobset}->name, $c->stash->{job}->name]});

[3.665]

[4.799]

        ->search({}, {bind => [$c->stash->{jobset}->id, $c->stash->{job}->name]});

Replacement in src/lib/Hydra/Controller/Jobset.pm at line 165 [5.104]

B:BD[3.1036] → [2.183:244]

        ->search({}, {bind => [$c->stash->{jobset}->name]});

[3.1036]

[5.1029]

        ->search({}, {bind => [$c->stash->{jobset}->id]});

Replacement in src/lib/Hydra/Schema/Builds.pm at line 625 [6.5202]

B:BD[3.3099] → [2.245:432]

makeQueries('ForJobset', "and jobset_id = (select id from jobsets j where j.name = ?)");
makeQueries('ForJob', "and jobset_id = (select id from jobsets j where j.name = ?) and job = ?");

[3.3099]

[3.3228]

makeQueries('ForJobset', "and jobset_id = ?");
makeQueries('ForJob', "and jobset_id = ? and job = ?");