From e46acbf05b14d2b3bd9fcf892a0575cfc34a0818 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 17:21:55 +0100
Subject: [PATCH] Remove the errorMsg column from the Builds table

The queue runner no longer uses this field, and it doesn't provide
very interesting historical data (mostly SSH failures), but it takes
up a lot of space. Also, it contained some bad UTF-8 which was
preventing an upgrade to Postgres 9.5, so a good occasion to get rid
of it.
---
 src/lib/Hydra/Schema/Builds.pm | 11 ++---------
 src/root/build.tt              |  5 -----
 src/sql/hydra.sql              |  4 +---
 src/sql/upgrade-44.sql         |  1 +
 4 files changed, 4 insertions(+), 17 deletions(-)
 create mode 100644 src/sql/upgrade-44.sql

diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
index fbf64d45..f800c41a 100644
--- a/src/lib/Hydra/Schema/Builds.pm
+++ b/src/lib/Hydra/Schema/Builds.pm
@@ -170,11 +170,6 @@ __PACKAGE__->table("Builds");
   data_type: 'integer'
   is_nullable: 1
 
-=head2 errormsg
-
-  data_type: 'text'
-  is_nullable: 1
-
 =head2 size
 
   data_type: 'bigint'
@@ -249,8 +244,6 @@ __PACKAGE__->add_columns(
   { data_type => "integer", is_nullable => 1 },
   "buildstatus",
   { data_type => "integer", is_nullable => 1 },
-  "errormsg",
-  { data_type => "text", is_nullable => 1 },
   "size",
   { data_type => "bigint", is_nullable => 1 },
   "closuresize",
@@ -544,8 +537,8 @@ __PACKAGE__->many_to_many(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07043 @ 2015-10-27 13:54:16
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:iN9vwO5i3dURKOTgaPTHxw
+# Created by DBIx::Class::Schema::Loader v0.07043 @ 2016-02-12 17:20:42
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/8aVtXu/+o0jmKHnSzwt+g
 
 __PACKAGE__->has_many(
   "dependents",
diff --git a/src/root/build.tt b/src/root/build.tt
index 3cafc571..1ed16fd8 100644
--- a/src/root/build.tt
+++ b/src/root/build.tt
@@ -280,11 +280,6 @@ FOR step IN steps; IF step.busy; busy = 1; END; END;
         </table>
       [% END %]
 
-      [% IF build.errormsg && build.buildstatus != 5 %]
-        <h2 id="nix-error">Nix error output</h2>
-        <pre class="buildlog">[% HTML.escape(build.errormsg) %]</pre>
-      [% END %]
-
     [% END %]
 
   </div>
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 2e7bf0ce..b627684d 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -184,7 +184,7 @@ create table Builds (
     --   0 = succeeded
     --   1 = build of this derivation failed
     --   2 = build of some dependency failed
-    --   3 = other failure (see errorMsg)
+    --   3 = other failure
     --   4 = build cancelled (removed from queue; never built)
     --   5 = build not done because a dependency failed previously (obsolete)
     --   6 = failure with output
@@ -193,8 +193,6 @@ create table Builds (
     --  10 = log limit exceeded
     buildStatus   integer,
 
-    errorMsg      text, -- error message in case of a Nix failure
-
     size          bigint,
     closureSize   bigint,
 
diff --git a/src/sql/upgrade-44.sql b/src/sql/upgrade-44.sql
new file mode 100644
index 00000000..3f43f1bc
--- /dev/null
+++ b/src/sql/upgrade-44.sql
@@ -0,0 +1 @@
+alter table Builds drop column errorMsg;