Bug 711925: Update from 4.0 or older to 4.2 or trunk fails when bug_see_also field...

r=wicked a=LpSolit

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index adbbf7b38d06a39167cd76c727d80ca08916d147..7b7e4ffb613480e5196338537b19a58d052e4eaf 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -502,7 +502,7 @@ use constant ABSTRACT_SCHEMA => {
                                       COLUMN => 'bug_id',
                                       DELETE => 'CASCADE'}},
             value  => {TYPE => 'varchar(255)', NOTNULL => 1},
-            class  => {TYPE => 'varchar(255)', NOTNULL => 1},
+            class  => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
         ],
         INDEXES => [
             bug_see_also_bug_id_idx => {FIELDS => [qw(bug_id value)], 

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index dff3c6d2e905bbbf5f61b3de84a6e9a8950f67a5..b98b8807700a31a670a862bb96a2aa47141f729b 100644 (file)
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -3568,7 +3568,7 @@ sub _populate_bug_see_also_class {
     }
 
     $dbh->bz_add_column('bug_see_also', 'class',
-        {TYPE => 'varchar(255)', NOTNULL => 1}, '');
+        {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
 
     my $result = $dbh->selectall_arrayref(
         "SELECT id, value FROM bug_see_also");