lix-project/hydra
4
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Fix deprecation warnings with libpqxx usage

Browse source
This commit is contained in:
Nathan van Doorn 2021-07-05 19:45:25 +01:00
parent e02f34722f
commit 5c47343b40
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hydra-evaluator/hydra-evaluator.cc
View file

@ -233,12 +233,12 @@ struct Evaluator
pqxx::work txn(*conn); pqxx::work txn(*conn);
if (jobset.evaluation_style == EvaluationStyle::ONE_AT_A_TIME) { if (jobset.evaluation_style == EvaluationStyle::ONE_AT_A_TIME) {
auto evaluation_res = txn.parameterized auto evaluation_res = txn.exec_params
("select id from JobsetEvals " ("select id from JobsetEvals "
"where jobset_id = $1 " "where jobset_id = $1 "
"order by id desc limit 1") "order by id desc limit 1"
(jobset.name.id) ,jobset.name.id
.exec(); );
if (evaluation_res.empty()) { if (evaluation_res.empty()) {
// First evaluation, so allow scheduling. // First evaluation, so allow scheduling.
@ -249,15 +249,15 @@ struct Evaluator
auto evaluation_id = evaluation_res[0][0].as<int>(); auto evaluation_id = evaluation_res[0][0].as<int>();
auto unfinished_build_res = txn.parameterized auto unfinished_build_res = txn.exec_params
("select id from Builds " ("select id from Builds "
"join JobsetEvalMembers " "join JobsetEvalMembers "
" on (JobsetEvalMembers.build = Builds.id) " " on (JobsetEvalMembers.build = Builds.id) "
"where JobsetEvalMembers.eval = $1 " "where JobsetEvalMembers.eval = $1 "
" and builds.finished = 0 " " and builds.finished = 0 "
" limit 1") " limit 1"
(evaluation_id) ,evaluation_id
.exec(); );
// If the previous evaluation has no unfinished builds // If the previous evaluation has no unfinished builds
// schedule! // schedule!