Bug 573454: Make the products.description field be NOT NULL in the

database
r=timello, a=mkanat

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index c354c1bebd96e5391631477748f692e9c2706bcf..9fc507885014173c9321578f1d467b1c48b5e873 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -1217,7 +1217,7 @@ use constant ABSTRACT_SCHEMA => {
                                   REFERENCES => {TABLE  => 'classifications',
                                                  COLUMN => 'id',
                                                  DELETE => 'CASCADE'}},
-            description       => {TYPE => 'MEDIUMTEXT'},
+            description       => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
             isactive          => {TYPE => 'BOOLEAN', NOTNULL => 1,
                                   DEFAULT => 1},
             defaultmilestone  => {TYPE => 'varchar(20)',

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 7599199ab6a67d5ea9a31df74618fb627477da53..069096800ecaaca5db35c1d9064decaea971dac1 100644 (file)
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -616,10 +616,14 @@ sub update_table_definitions {
     $dbh->bz_alter_column('group_control_map', 'othercontrol',
                           {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA});
 
+    # Add NOT NULL to some columns that need it, and DEFAULT to
+    # attachments.ispatch.
     $dbh->bz_alter_column('attachments', 'ispatch', 
         { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
     $dbh->bz_alter_column('keyworddefs', 'description',
                           { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
+    $dbh->bz_alter_column('products', 'description',
+                          { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
 
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #