From 2ca283e7bfc85d86ffd5f312bbab89eedcf9929b Mon Sep 17 00:00:00 2001 From: Edmund Wong Date: Thu, 6 May 2010 20:33:25 -0700 Subject: Bug 463945: Add default values for membercontrol and othercontrol in group_control_map, and fix their DB type to be correct r=mkanat, a=mkanat --- Bugzilla/DB/Schema.pm | 6 ++++-- Bugzilla/Install/DB.pm | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 8e0458a51..c66f401de 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -1037,8 +1037,10 @@ use constant ABSTRACT_SCHEMA => { DELETE => 'CASCADE'}}, entry => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}, - membercontrol => {TYPE => 'BOOLEAN', NOTNULL => 1}, - othercontrol => {TYPE => 'BOOLEAN', NOTNULL => 1}, + membercontrol => {TYPE => 'INT1', NOTNULL => 1, + DEFAULT => CONTROLMAPNA}, + othercontrol => {TYPE => 'INT1', NOTNULL => 1, + DEFAULT => CONTROLMAPNA}, canedit => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}, editcomponents => {TYPE => 'BOOLEAN', NOTNULL => 1, diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index aa71c7d0a..fb199b2f0 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -604,6 +604,12 @@ sub update_table_definitions { # 2010-04-07 LpSolit@gmail.com - Bug 69621 $dbh->bz_drop_column('bugs', 'keywords'); + + # 2010-05-07 ewong@pw-wspx.org - Bug 463945 + $dbh->bz_alter_column('group_control_map', 'membercontrol', + {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA}); + $dbh->bz_alter_column('group_control_map', 'othercontrol', + {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA}); ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # -- cgit v1.2.3-24-g4f1b