ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

qualify ordery_by clauses when necessary, remove unnecessary order_by's, reported by Ludo, resulted in errors in sqlite

Browse source
This commit is contained in:
Rob Vermaas 2011-04-01 07:40:06 +00:00
parent ffa4ba3b9e
commit fca3019c7b
3 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Controller/Admin.pm
View file

@ -58,7 +58,7 @@ sub index : Chained('admin') PathPart('') Args(0) {
$c->stash->{steps} = [ $c->model('DB::BuildSteps')->search( $c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
{ 'me.busy' => 1, 'schedulingInfo.busy' => 1 }, { 'me.busy' => 1, 'schedulingInfo.busy' => 1 },
{ join => [ 'schedulingInfo', 'build' ] { join => [ 'schedulingInfo', 'build' ]
, order_by => [ 'machine', 'outpath' ] , order_by => [ 'machine' ]
} ) ]; } ) ];
$c->stash->{template} = 'admin.tt'; $c->stash->{template} = 'admin.tt';
} }

2
src/lib/Hydra/Controller/Root.pm
View file

@ -101,7 +101,7 @@ sub status :Local {
$c->stash->{steps} = [ $c->model('DB::BuildSteps')->search( $c->stash->{steps} = [ $c->model('DB::BuildSteps')->search(
{ 'me.busy' => 1, 'schedulingInfo.busy' => 1 }, { 'me.busy' => 1, 'schedulingInfo.busy' => 1 },
{ join => [ 'schedulingInfo', 'build' ] { join => [ 'schedulingInfo', 'build' ]
, order_by => [ 'machine', 'outpath' ] , order_by => [ 'machine' ]
} ) ]; } ) ];
} }

2
src/script/hydra_update_gc_roots.pl.in
View file

@ -69,7 +69,7 @@ foreach my $project ($db->resultset('Projects')->all) {
, system => $system->system , system => $system->system
}, },
{ join => 'resultInfo' { join => 'resultInfo'
, order_by => 'id DESC' , order_by => 'me.id DESC'
, rows => $keepnr , rows => $keepnr
}); });
keepBuild $_ foreach @recentBuilds; keepBuild $_ foreach @recentBuilds;