From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Tue, 18 Jun 2019 18:41:09 +0000 (-0400)
Subject: Bug 1546788 - schema change only
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e86ff67835d380dcfffff7cdf1bc0bf7be2f3ce;p=thirdparty%2Fbugzilla.git

Bug 1546788 - schema change only
---

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index a4bc54a33..9e346e3ef 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -91,7 +91,7 @@ use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 # Bugzilla with enums. After that, they are either controlled through
 # the Bugzilla UI or through the DB.
 use constant ENUM_DEFAULTS => {
-  bug_type => ['defect', 'enhancement', 'task'],
+  bug_type => ['defect', 'enhancement', 'task', '--'],
   bug_severity =>
     ['blocker', 'critical', 'major', 'normal', 'minor', 'trivial'],
   priority     => ["Highest", "High",    "Normal",    "Low",   "Lowest", "---"],
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 2e8cb3640..c67e6553b 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -246,7 +246,7 @@ use constant ABSTRACT_SCHEMA => {
       bug_file_loc => {TYPE => 'MEDIUMTEXT',   NOTNULL => 1, DEFAULT => "''"},
       bug_severity => {TYPE => 'varchar(64)',  NOTNULL => 1},
       bug_status   => {TYPE => 'varchar(64)',  NOTNULL => 1},
-      bug_type     => {TYPE => 'varchar(20)'},
+      bug_type     => {TYPE => 'varchar(20)',  NOTNULL => 1},
       creation_ts  => {TYPE => 'DATETIME'},
       delta_ts     => {TYPE => 'DATETIME',     NOTNULL => 1},
       short_desc   => {TYPE => 'varchar(255)', NOTNULL => 1},
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 49e37436f..9b2c2a22e 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -787,10 +787,12 @@ sub update_table_definitions {
   $dbh->bz_add_column('products', 'bug_description_template',
     {TYPE => 'MEDIUMTEXT'});
 
-  # Bug 1522341, 1541617 - kohei.yoshino@gmail.com
+  # Bug 1522341, 1541617, 1546788 - kohei.yoshino@gmail.com
   $dbh->bz_add_column('bugs', 'bug_type', {TYPE => 'varchar(20)'});
   $dbh->bz_add_column('components', 'default_bug_type', {TYPE => 'varchar(20)'});
   $dbh->bz_add_column('products',   'default_bug_type', {TYPE => 'varchar(20)'});
+  $dbh->bz_alter_column('bugs', 'bug_type',
+    {TYPE => 'varchar(20)', NOTNULL => 1}, '--');
 
   _add_oauth2_jwt_support();