From e8f272c6f79dc8a919911d88a5b455bc67792f64 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sun, 8 Apr 2018 15:19:01 -0400
Subject: Bug 1427884 - Add upgrade tests from 4.2 to Harmony on mysql

---
 extensions/ComponentWatching/Extension.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'extensions/ComponentWatching')

diff --git a/extensions/ComponentWatching/Extension.pm b/extensions/ComponentWatching/Extension.pm
index 526ba1c5e..ed47e64c3 100644
--- a/extensions/ComponentWatching/Extension.pm
+++ b/extensions/ComponentWatching/Extension.pm
@@ -158,7 +158,9 @@ sub object_columns {
     my $columns = $args->{columns};
     return unless $class->isa('Bugzilla::Component');
 
-    push(@$columns, 'watch_user');
+    if (Bugzilla->dbh->bz_column_info($class->DB_TABLE, 'watch_user')) {
+        push @$columns, 'watch_user';
+    }
 }
 
 sub object_update_columns {
-- 
cgit v1.2.3-24-g4f1b