Bug 409463: The flagtypes.description DB format is not the same in an upgraded instal...

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 2be64cab3a34cc8601d68368832b20289c768f9c..3d7f56674a8fe071371869c243af0df5b53f6bc5 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -470,7 +470,7 @@ use constant ABSTRACT_SCHEMA => {
             id               => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
                                  PRIMARYKEY => 1},
             name             => {TYPE => 'varchar(50)', NOTNULL => 1},
-            description      => {TYPE => 'MEDIUMTEXT'},
+            description      => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
             cc_list          => {TYPE => 'varchar(200)'},
             target_type      => {TYPE => 'char(1)', NOTNULL => 1,
                                  DEFAULT => "'b'"},

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 3b44f3016759f885f9957b1758d6ef14a24eade0..43c81d1dd98a3a867fdf9bea65ee96bf451fa51d 100644 (file)
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -2948,8 +2948,9 @@ sub change_text_types {
         { TYPE => 'TINYTEXT', NOTNULL => 1 });
     $dbh->bz_alter_column('attachments', 'mimetype',
         { TYPE => 'TINYTEXT', NOTNULL => 1 });
+    # This also changes NULL to NOT NULL.
     $dbh->bz_alter_column('flagtypes', 'description',
-        { TYPE => 'MEDIUMTEXT', NOTNULL => 1 });
+        { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
     $dbh->bz_alter_column('fielddefs', 'description',
         { TYPE => 'TINYTEXT', NOTNULL => 1 });
     $dbh->bz_alter_column('namedqueries', 'query',