Bug 286695: bugs.resolution needs a default value

Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=justdave

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index a58c20ade9b24f94456fc8b0d98525200b14fb11..19357b88806ab72d35250cb949615dfaa4c5d682 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -165,7 +165,8 @@ use constant ABSTRACT_SCHEMA => {
             reporter            => {TYPE => 'INT3', NOTNULL => 1},
             version             => {TYPE => 'varchar(64)', NOTNULL => 1},
             component_id        => {TYPE => 'INT2', NOTNULL => 1},
-            resolution          => {TYPE => 'varchar(64)', NOTNULL => 1},
+            resolution          => {TYPE => 'varchar(64)',
+                                    NOTNULL => 1, DEFAULT => "''"},
             target_milestone    => {TYPE => 'varchar(20)',
                                     NOTNULL => 1, DEFAULT => "'---'"},
             qa_contact          => {TYPE => 'INT3'},

diff --git a/checksetup.pl b/checksetup.pl
index 8349713e9d42b23fa480b65713dfc97b0ad5ae6b..09e8dc4baa4fc9725b13a9b68c5fd4cdcdb3593d 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3606,8 +3606,9 @@ if (!$dbh->bz_column_info('longdescs', 'already_wrapped')) {
 # standard varchars in the bugs table.
 $dbh->bz_alter_column('bugs', 'bug_status', 
                       {TYPE => 'varchar(64)', NOTNULL => 1});
+# 2005-03-23 Tomas.Kopal@altap.cz - add default value to resolution, bug 286695
 $dbh->bz_alter_column('bugs', 'resolution',
-                      {TYPE => 'varchar(64)', NOTNULL => 1});
+                      {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "''"});
 $dbh->bz_alter_column('bugs', 'priority',
                       {TYPE => 'varchar(64)', NOTNULL => 1});
 $dbh->bz_alter_column('bugs', 'bug_severity',