From e5393c2cf87909b251d0ddcdc1ea254956d79660 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 19 Mar 2022 23:34:13 -0400
Subject: [PATCH] fixup: make id non-ambiguous

---
 src/script/hydra-update-gc-roots                  | 10 +++++-----
 t/scripts/hydra-update-gc-roots/update-gc-roots.t |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/script/hydra-update-gc-roots b/src/script/hydra-update-gc-roots
index 315d4ebb..11eba7a6 100755
--- a/src/script/hydra-update-gc-roots
+++ b/src/script/hydra-update-gc-roots
@@ -135,11 +135,11 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
         # Note: we also keep the derivations of failed builds so that
         # they can be restarted.
         keepBuild($_, 1) foreach $jobset->builds->search(
-            { id => { -in => $db->resultset('JobsetEvalMembers')->search({ eval => { -in => [@evals] } }, { select => "build" })->as_query }
+            { "me.id" => { -in => $db->resultset('JobsetEvalMembers')->search({ eval => { -in => [@evals] } }, { select => "build" })->as_query }
             , finished => 1
             },
             {
-                order_by => ["job", "id"],
+                order_by => ["job", "me.id"],
                 columns => [ @columns ],
                 join      => 'jobset',
                 '+select' => ['jobset.project', 'jobset.name'],
@@ -153,7 +153,7 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
         # Keep the most recently succeeded build of a current job. Oh
         # I really need to stop using DBIx::Class.
         keepBuild($_, 1) foreach $jobset->builds->search(
-            { id => { -in => $jobset->builds->search(
+            { "me.id" => { -in => $jobset->builds->search(
                 { finished => 1
                 , buildstatus => [0, 6]
                 , job => { -in => $jobset->builds->search(
@@ -162,11 +162,11 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
                                )->as_query }
                 },
                 { group_by => 'job'
-                , select => [ { max => 'id', -as => 'm' } ]
+                , select => [ { max => 'me.id', -as => 'm' } ]
                 })->as_query }
             },
             {
-                columns => [ @columns ]
+                columns => [ @columns ],
                 join      => 'jobset',
                 '+select' => ['jobset.project', 'jobset.name'],
                 '+as'     => ['jobset.project', 'jobset.name'],
diff --git a/t/scripts/hydra-update-gc-roots/update-gc-roots.t b/t/scripts/hydra-update-gc-roots/update-gc-roots.t
index d47e36c1..3e019ece 100644
--- a/t/scripts/hydra-update-gc-roots/update-gc-roots.t
+++ b/t/scripts/hydra-update-gc-roots/update-gc-roots.t
@@ -16,7 +16,7 @@ subtest "Updating GC roots" => sub {
     is($res, 0, "hydra-update-gc-roots should exit zero");
     if ($res != 0) {
         print "gc roots stdout: $stdout\n";
-        print "gc roots stderr: $stderr";
+        print "gc roots stderr: $stderr\n";
     }
 };