Update libpqxx usage to move away from deprecated API interactions.

src/hydra-evaluator/hydra-evaluator.cc

@@ -59,9 +59,9 @@ struct Evaluator
 
         pqxx::work txn(*conn);
 
-        auto res = txn.parameterized
+        auto res = txn.exec
             ("select project, j.name, lastCheckedTime, triggerTime, checkInterval from Jobsets j join Projects p on j.project = p.name "
-             "where j.enabled != 0 and p.enabled != 0").exec();
+             "where j.enabled != 0 and p.enabled != 0");
 
         auto state(state_.lock());
 
@@ -107,12 +107,11 @@ struct Evaluator
         {
             auto conn(dbPool.get());
             pqxx::work txn(*conn);
-            txn.parameterized
-                ("update Jobsets set startTime = $1 where project = $2 and name = $3")
-                (now)
-                (jobset.name.first)
-                (jobset.name.second)
-                .exec();
+            txn.exec_params0
+                ("update Jobsets set startTime = $1 where project = $2 and name = $3",
+                 now,
+                 jobset.name.first,
+                 jobset.name.second);
             txn.commit();
         }
 
@@ -266,27 +265,24 @@ struct Evaluator
                             /* Clear the trigger time to prevent this
                                jobset from getting stuck in an endless
                                failing eval loop. */
-                            txn.parameterized
-                                ("update Jobsets set triggerTime = null where project = $1 and name = $2 and startTime is not null and triggerTime <= startTime")
-                                (jobset.name.first)
-                                (jobset.name.second)
-                                .exec();
+                            txn.exec_params0
+                                ("update Jobsets set triggerTime = null where project = $1 and name = $2 and startTime is not null and triggerTime <= startTime",
+                                 jobset.name.first,
+                                 jobset.name.second);
 
                             /* Clear the start time. */
-                            txn.parameterized
-                                ("update Jobsets set startTime = null where project = $1 and name = $2")
-                                (jobset.name.first)
-                                (jobset.name.second)
-                                .exec();
+                            txn.exec_params0
+                                ("update Jobsets set startTime = null where project = $1 and name = $2",
+                                 jobset.name.first,
+                                 jobset.name.second);
 
                             if (!WIFEXITED(status) || WEXITSTATUS(status) > 1) {
-                                txn.parameterized
-                                    ("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where project = $3 and name = $4")
-                                    (fmt("evaluation %s", statusToString(status)))
-                                    (now)
-                                    (jobset.name.first)
-                                    (jobset.name.second)
-                                    .exec();
+                                txn.exec_params0
+                                    ("update Jobsets set errorMsg = $1, lastCheckedTime = $2, errorTime = $2, fetchErrorMsg = null where project = $3 and name = $4",
+                                     fmt("evaluation %s", statusToString(status)),
+                                     now,
+                                     jobset.name.first,
+                                     jobset.name.second);
                             }
 
                             txn.commit();
@@ -311,7 +307,7 @@ struct Evaluator
     {
         auto conn(dbPool.get());
         pqxx::work txn(*conn);
-        txn.parameterized("update Jobsets set startTime = null").exec();
+        txn.exec("update Jobsets set startTime = null");
         txn.commit();
     }
 

src/hydra-queue-runner/builder.cc

@@ -424,13 +424,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
                 for (auto & build2 : indirect) {
                     if (build2->finishedInDB) continue;
                     printMsg(lvlError, format("marking build %1% as failed") % build2->id);
-                    txn.parameterized
-                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0")
-                        (build2->id)
-                        ((int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus()))
-                        (result.startTime)
-                        (result.stopTime)
-                        (result.stepStatus == bsCachedFailure ? 1 : 0).exec();
+                    txn.exec_params0
+                        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0",
+                         build2->id,
+                         (int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus()),
+                         result.startTime,
+                         result.stopTime,
+                         result.stepStatus == bsCachedFailure ? 1 : 0);
                     nrBuildsDone++;
                 }
 
@@ -438,7 +438,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
                    won't be built again. */
                 if (result.stepStatus != bsCachedFailure && result.canCache)
                     for (auto & path : step->drv.outputPaths())
-                        txn.parameterized("insert into FailedPaths values ($1)")(path).exec();
+                        txn.exec_params0("insert into FailedPaths values ($1)", path);
 
                 txn.commit();
             }

src/hydra-queue-runner/hydra-queue-runner.cc

@@ -1,5 +1,6 @@
 #include <iostream>
 #include <thread>
+#include <optional>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -226,18 +227,18 @@ void State::monitorMachinesFile()
 void State::clearBusy(Connection & conn, time_t stopTime)
 {
     pqxx::work txn(conn);
-    txn.parameterized
-        ("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy != 0")
-        ((int) bsAborted)
-        (stopTime, stopTime != 0).exec();
+    txn.exec_params0
+        ("update BuildSteps set busy = 0, status = $1, stopTime = $2 where busy != 0",
+         (int) bsAborted,
+         stopTime != 0 ? std::make_optional(stopTime) : std::nullopt);
     txn.commit();
 }
 
 
 unsigned int State::allocBuildStep(pqxx::work & txn, BuildID buildId)
 {
-    auto res = txn.parameterized("select max(stepnr) from BuildSteps where build = $1")(buildId).exec();
-    return res[0][0].is_null() ? 1 : res[0][0].as<int>() + 1;
+    auto res = txn.exec_params1("select max(stepnr) from BuildSteps where build = $1", buildId);
+    return res[0].is_null() ? 1 : res[0].as<int>() + 1;
 }
 
 
@@ -247,27 +248,27 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID
  restart:
     auto stepNr = allocBuildStep(txn, buildId);
 
-    auto r = txn.parameterized
-        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime, machine) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) on conflict do nothing")
-        (buildId)
-        (stepNr)
-        (0) // == build
-        (step->drvPath)
-        (status == bsBusy ? 1 : 0)
-        (startTime, startTime != 0)
-        (step->drv.platform)
-        ((int) status, status != bsBusy)
-        (propagatedFrom, propagatedFrom != 0)
-        (errorMsg, errorMsg != "")
-        (startTime, startTime != 0 && status != bsBusy)
-        (machine).exec();
+    auto r = txn.exec_params
+        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, startTime, system, status, propagatedFrom, errorMsg, stopTime, machine) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12) on conflict do nothing",
+         buildId,
+         stepNr,
+         0, // == build
+         step->drvPath,
+         status == bsBusy ? 1 : 0,
+         startTime != 0 ? std::make_optional(startTime) : std::nullopt,
+         step->drv.platform,
+         status != bsBusy ? std::make_optional((int) status) : std::nullopt,
+         propagatedFrom != 0 ? std::make_optional(propagatedFrom) : std::nullopt, // internal::params
+         errorMsg != "" ? std::make_optional(errorMsg) : std::nullopt,
+         startTime != 0 && status != bsBusy ? std::make_optional(startTime) : std::nullopt,
+         machine);
 
     if (r.affected_rows() == 0) goto restart;
 
     for (auto & output : step->drv.outputs)
-        txn.parameterized
-            ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)")
-            (buildId)(stepNr)(output.first)(output.second.path).exec();
+        txn.exec_params0
+            ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)",
+             buildId, stepNr, output.first, output.second.path);
 
     if (status == bsBusy)
         txn.exec(fmt("notify step_started, '%d\t%d'", buildId, stepNr));
@@ -278,12 +279,11 @@ unsigned int State::createBuildStep(pqxx::work & txn, time_t startTime, BuildID
 
 void State::updateBuildStep(pqxx::work & txn, BuildID buildId, unsigned int stepNr, StepState stepState)
 {
-    if (txn.parameterized
-        ("update BuildSteps set busy = $1 where build = $2 and stepnr = $3 and busy != 0 and status is null")
-        ((int) stepState)
-        (buildId)
-        (stepNr)
-        .exec().affected_rows() != 1)
+    if (txn.exec_params
+        ("update BuildSteps set busy = $1 where build = $2 and stepnr = $3 and busy != 0 and status is null",
+         (int) stepState,
+         buildId,
+         stepNr).affected_rows() != 1)
         throw Error("step %d of build %d is in an unexpected state", stepNr, buildId);
 }
 
@@ -293,16 +293,15 @@ void State::finishBuildStep(pqxx::work & txn, const RemoteResult & result,
 {
     assert(result.startTime);
     assert(result.stopTime);
-    txn.parameterized
-        ("update BuildSteps set busy = 0, status = $1, errorMsg = $4, startTime = $5, stopTime = $6, machine = $7, overhead = $8, timesBuilt = $9, isNonDeterministic = $10 where build = $2 and stepnr = $3")
-        ((int) result.stepStatus)(buildId)(stepNr)
-        (result.errorMsg, result.errorMsg != "")
-        (result.startTime)(result.stopTime)
-        (machine, machine != "")
-        (result.overhead, result.overhead != 0)
-        (result.timesBuilt, result.timesBuilt > 0)
-        (result.isNonDeterministic, result.timesBuilt > 1)
-        .exec();
+    txn.exec_params0
+        ("update BuildSteps set busy = 0, status = $1, errorMsg = $4, startTime = $5, stopTime = $6, machine = $7, overhead = $8, timesBuilt = $9, isNonDeterministic = $10 where build = $2 and stepnr = $3",
+         (int) result.stepStatus, buildId, stepNr,
+         result.errorMsg != "" ? std::make_optional(result.errorMsg) : std::nullopt,
+         result.startTime, result.stopTime,
+         machine != "" ? std::make_optional(machine) : std::nullopt,
+         result.overhead != 0 ? std::make_optional(result.overhead) : std::nullopt,
+         result.timesBuilt > 0 ? std::make_optional(result.timesBuilt) : std::nullopt,
+         result.timesBuilt > 1 ? std::make_optional(result.isNonDeterministic) : std::nullopt);
     assert(result.logFile.find('\t') == std::string::npos);
     txn.exec(fmt("notify step_finished, '%d\t%d\t%s'",
             buildId, stepNr, result.logFile));
@@ -315,22 +314,22 @@ int State::createSubstitutionStep(pqxx::work & txn, time_t startTime, time_t sto
  restart:
     auto stepNr = allocBuildStep(txn, build->id);
 
-    auto r = txn.parameterized
-        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, status, startTime, stopTime) values ($1, $2, $3, $4, $5, $6, $7, $8) on conflict do nothing")
-        (build->id)
-        (stepNr)
-        (1) // == substitution
-        (drvPath)
-        (0)
-        (0)
-        (startTime)
-        (stopTime).exec();
+    auto r = txn.exec_params
+        ("insert into BuildSteps (build, stepnr, type, drvPath, busy, status, startTime, stopTime) values ($1, $2, $3, $4, $5, $6, $7, $8) on conflict do nothing",
+         build->id,
+         stepNr,
+         1, // == substitution
+         drvPath,
+         0,
+         0,
+         startTime,
+         stopTime);
 
     if (r.affected_rows() == 0) goto restart;
 
-    txn.parameterized
-        ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)")
-        (build->id)(stepNr)(outputName)(storePath).exec();
+    txn.exec_params0
+        ("insert into BuildStepOutputs (build, stepnr, name, path) values ($1, $2, $3, $4)",
+         build->id, stepNr, outputName, storePath);
 
     return stepNr;
 }
@@ -397,50 +396,50 @@ void State::markSucceededBuild(pqxx::work & txn, Build::ptr build,
 {
     if (build->finishedInDB) return;
 
-    if (txn.parameterized("select 1 from Builds where id = $1 and finished = 0")(build->id).exec().empty()) return;
+    if (txn.exec_params("select 1 from Builds where id = $1 and finished = 0", build->id).empty()) return;
 
-    txn.parameterized
-        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8, notificationPendingSince = $4 where id = $1")
-        (build->id)
-        ((int) (res.failed ? bsFailedWithOutput : bsSuccess))
-        (startTime)
-        (stopTime)
-        (res.size)
-        (res.closureSize)
-        (res.releaseName, res.releaseName != "")
-        (isCachedBuild ? 1 : 0).exec();
+    txn.exec_params0
+        ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, size = $5, closureSize = $6, releaseName = $7, isCachedBuild = $8, notificationPendingSince = $4 where id = $1",
+         build->id,
+         (int) (res.failed ? bsFailedWithOutput : bsSuccess),
+         startTime,
+         stopTime,
+         res.size,
+         res.closureSize,
+         res.releaseName != "" ? std::make_optional(res.releaseName) : std::nullopt,
+         isCachedBuild ? 1 : 0);
 
-    txn.parameterized("delete from BuildProducts where build = $1")(build->id).exec();
+    txn.exec_params0("delete from BuildProducts where build = $1", build->id);
 
     unsigned int productNr = 1;
     for (auto & product : res.products) {
-        txn.parameterized
-            ("insert into BuildProducts (build, productnr, type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)")
-            (build->id)
-            (productNr++)
-            (product.type)
-            (product.subtype)
-            (product.fileSize, product.isRegular)
-            (product.sha1hash.to_string(Base16, false), product.isRegular)
-            (product.sha256hash.to_string(Base16, false), product.isRegular)
-            (product.path)
-            (product.name)
-            (product.defaultPath).exec();
+        txn.exec_params0
+            ("insert into BuildProducts (build, productnr, type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
+             build->id,
+             productNr++,
+             product.type,
+             product.subtype,
+             product.isRegular ? std::make_optional(product.fileSize) : std::nullopt,
+             product.isRegular ? std::make_optional(product.sha1hash.to_string(Base16, false)) : std::nullopt,
+             product.isRegular ? std::make_optional(product.sha256hash.to_string(Base16, false)) : std::nullopt,
+             product.path,
+             product.name,
+             product.defaultPath);
     }
 
-    txn.parameterized("delete from BuildMetrics where build = $1")(build->id).exec();
+    txn.exec_params0("delete from BuildMetrics where build = $1", build->id);
 
     for (auto & metric : res.metrics) {
-        txn.parameterized
-            ("insert into BuildMetrics (build, name, unit, value, project, jobset, job, timestamp) values ($1, $2, $3, $4, $5, $6, $7, $8)")
-            (build->id)
-            (metric.second.name)
-            (metric.second.unit, metric.second.unit != "")
-            (metric.second.value)
-            (build->projectName)
-            (build->jobsetName)
-            (build->jobName)
-            (build->timestamp).exec();
+        txn.exec_params0
+            ("insert into BuildMetrics (build, name, unit, value, project, jobset, job, timestamp) values ($1, $2, $3, $4, $5, $6, $7, $8)",
+             build->id,
+             metric.second.name,
+             metric.second.unit != "" ? std::make_optional(metric.second.unit) : std::nullopt,
+             metric.second.value,
+             build->projectName,
+             build->jobsetName,
+             build->jobName,
+             build->timestamp);
     }
 
     nrBuildsDone++;
@@ -451,7 +450,7 @@ bool State::checkCachedFailure(Step::ptr step, Connection & conn)
 {
     pqxx::work txn(conn);
     for (auto & path : step->drv.outputPaths())
-        if (!txn.parameterized("select 1 from FailedPaths where path = $1")(path).exec().empty())
+        if (!txn.exec_params("select 1 from FailedPaths where path = $1", path).empty())
             return true;
     return false;
 }
@@ -677,7 +676,7 @@ void State::dumpStatus(Connection & conn, bool log)
         pqxx::work txn(conn);
         // FIXME: use PostgreSQL 9.5 upsert.
         txn.exec("delete from SystemStatus where what = 'queue-runner'");
-        txn.parameterized("insert into SystemStatus values ('queue-runner', $1)")(out.str()).exec();
+        txn.exec_params0("insert into SystemStatus values ('queue-runner', $1)", out.str());
         txn.exec("notify status_dumped");
         txn.commit();
     }
@@ -807,11 +806,11 @@ void State::run(BuildID buildOne)
                 pqxx::work txn(*conn);
                 for (auto & step : steps) {
                     printMsg(lvlError, format("cleaning orphaned step %d of build %d") % step.second % step.first);
-                    txn.parameterized
-                        ("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy != 0")
-                        ((int) bsAborted)
-                        (step.first)
-                        (step.second).exec();
+                    txn.exec_params0
+                        ("update BuildSteps set busy = 0, status = $1 where build = $2 and stepnr = $3 and busy != 0",
+                         (int) bsAborted,
+                         step.first,
+                         step.second);
                 }
                 txn.commit();
             } catch (std::exception & e) {

src/hydra-queue-runner/queue-monitor.cc

@@ -90,10 +90,10 @@ bool State::getQueuedBuilds(Connection & conn,
     {
         pqxx::work txn(conn);
 
-        auto res = txn.parameterized
+        auto res = txn.exec_params
             ("select id, project, jobset, job, drvPath, maxsilent, timeout, timestamp, globalPriority, priority from Builds "
-             "where id > $1 and finished = 0 order by globalPriority desc, id")
-            (lastBuildId).exec();
+             "where id > $1 and finished = 0 order by globalPriority desc, id",
+            lastBuildId);
 
         for (auto const & row : res) {
             auto builds_(builds.lock());
@@ -137,11 +137,11 @@ bool State::getQueuedBuilds(Connection & conn,
             if (!build->finishedInDB) {
                 auto mc = startDbUpdate();
                 pqxx::work txn(conn);
-                txn.parameterized
-                    ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3 where id = $1 and finished = 0")
-                    (build->id)
-                    ((int) bsAborted)
-                    (time(0)).exec();
+                txn.exec_params0
+                    ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3 where id = $1 and finished = 0",
+                     build->id,
+                     (int) bsAborted,
+                     time(0));
                 txn.commit();
                 build->finishedInDB = true;
                 nrBuildsDone++;
@@ -169,16 +169,16 @@ bool State::getQueuedBuilds(Connection & conn,
                    derivation path, then by output path. */
                 BuildID propagatedFrom = 0;
 
-                auto res = txn.parameterized
-                    ("select max(build) from BuildSteps where drvPath = $1 and startTime != 0 and stopTime != 0 and status = 1")
-                    (ex.step->drvPath).exec();
-                if (!res[0][0].is_null()) propagatedFrom = res[0][0].as<BuildID>();
+                auto res = txn.exec_params1
+                    ("select max(build) from BuildSteps where drvPath = $1 and startTime != 0 and stopTime != 0 and status = 1",
+                     ex.step->drvPath);
+                if (!res[0].is_null()) propagatedFrom = res[0].as<BuildID>();
 
                 if (!propagatedFrom) {
                     for (auto & output : ex.step->drv.outputs) {
-                        auto res = txn.parameterized
-                            ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1")
-                            (output.second.path).exec();
+                        auto res = txn.exec_params
+                            ("select max(s.build) from BuildSteps s join BuildStepOutputs o on s.build = o.build where path = $1 and startTime != 0 and stopTime != 0 and status = 1",
+                             output.second.path);
                         if (!res[0][0].is_null()) {
                             propagatedFrom = res[0][0].as<BuildID>();
                             break;
@@ -187,12 +187,12 @@ bool State::getQueuedBuilds(Connection & conn,
                 }
 
                 createBuildStep(txn, 0, build->id, ex.step, "", bsCachedFailure, "", propagatedFrom);
-                txn.parameterized
+                txn.exec_params
                     ("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, isCachedBuild = 1, notificationPendingSince = $3 "
-                     "where id = $1 and finished = 0")
-                    (build->id)
-                    ((int) (ex.step->drvPath == build->drvPath ? bsFailed : bsDepFailed))
-                    (time(0)).exec();
+                     "where id = $1 and finished = 0",
+                     build->id,
+                     (int) (ex.step->drvPath == build->drvPath ? bsFailed : bsDepFailed),
+                     time(0));
                 notifyBuildFinished(txn, build->id, {});
                 txn.commit();
                 build->finishedInDB = true;
@@ -554,22 +554,25 @@ Jobset::ptr State::createJobset(pqxx::work & txn,
         if (i != jobsets_->end()) return i->second;
     }
 
-    auto res = txn.parameterized
-        ("select schedulingShares from Jobsets where project = $1 and name = $2")
-        (projectName)(jobsetName).exec();
+    auto res = txn.exec_params1
+        ("select schedulingShares from Jobsets where project = $1 and name = $2",
+         projectName,
+         jobsetName);
     if (res.empty()) throw Error("missing jobset - can't happen");
 
-    auto shares = res[0]["schedulingShares"].as<unsigned int>();
+    auto shares = res["schedulingShares"].as<unsigned int>();
 
     auto jobset = std::make_shared<Jobset>();
     jobset->setShares(shares);
 
     /* Load the build steps from the last 24 hours. */
-    res = txn.parameterized
+    auto res2 = txn.exec_params
         ("select s.startTime, s.stopTime from BuildSteps s join Builds b on build = id "
-         "where s.startTime is not null and s.stopTime > $1 and project = $2 and jobset = $3")
-        (time(0) - Jobset::schedulingWindow * 10)(projectName)(jobsetName).exec();
-    for (auto const & row : res) {
+         "where s.startTime is not null and s.stopTime > $1 and project = $2 and jobset = $3",
+         time(0) - Jobset::schedulingWindow * 10,
+         projectName,
+         jobsetName);
+    for (auto const & row : res2) {
         time_t startTime = row["startTime"].as<time_t>();
         time_t stopTime = row["stopTime"].as<time_t>();
         jobset->addStep(startTime, stopTime - startTime);
@@ -603,25 +606,25 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
     pqxx::work txn(conn);
 
     for (auto & output : drv.outputs) {
-        auto r = txn.parameterized
+        auto r = txn.exec_params1
             ("select id, buildStatus, releaseName, closureSize, size from Builds b "
              "join BuildOutputs o on b.id = o.build "
-             "where finished = 1 and (buildStatus = 0 or buildStatus = 6) and path = $1")
-            (output.second.path).exec();
+             "where finished = 1 and (buildStatus = 0 or buildStatus = 6) and path = $1",
+             output.second.path);
         if (r.empty()) continue;
-        BuildID id = r[0][0].as<BuildID>();
+        BuildID id = r[0].as<BuildID>();
 
         printMsg(lvlInfo, format("reusing build %d") % id);
 
         BuildOutput res;
-        res.failed = r[0][1].as<int>() == bsFailedWithOutput;
-        res.releaseName = r[0][2].is_null() ? "" : r[0][2].as<std::string>();
-        res.closureSize = r[0][3].is_null() ? 0 : r[0][3].as<unsigned long long>();
-        res.size = r[0][4].is_null() ? 0 : r[0][4].as<unsigned long long>();
+        res.failed = r[1].as<int>() == bsFailedWithOutput;
+        res.releaseName = r[2].is_null() ? "" : r[2].as<std::string>();
+        res.closureSize = r[3].is_null() ? 0 : r[3].as<unsigned long long>();
+        res.size = r[4].is_null() ? 0 : r[4].as<unsigned long long>();
 
-        auto products = txn.parameterized
-            ("select type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath from BuildProducts where build = $1 order by productnr")
-            (id).exec();
+        auto products = txn.exec_params
+            ("select type, subtype, fileSize, sha1hash, sha256hash, path, name, defaultPath from BuildProducts where build = $1 order by productnr",
+             id);
 
         for (auto row : products) {
             BuildProduct product;
@@ -645,9 +648,9 @@ BuildOutput State::getBuildOutputCached(Connection & conn, nix::ref<nix::Store>
             res.products.emplace_back(product);
         }
 
-        auto metrics = txn.parameterized
-            ("select name, unit, value from BuildMetrics where build = $1")
-            (id).exec();
+        auto metrics = txn.exec_params
+            ("select name, unit, value from BuildMetrics where build = $1",
+             id);
 
         for (auto row : metrics) {
             BuildMetric metric;