summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdmund Wong <ewong@pw-wspx.org>2010-05-07 05:33:25 +0200
committerMax Kanat-Alexander <mkanat@bugzilla.org>2010-05-07 05:33:25 +0200
commit2ca283e7bfc85d86ffd5f312bbab89eedcf9929b (patch)
tree1ced0b54d9a2bd4a3659945ef3ef19978d33b0df
parentdea4b3337e6c17c9c370dd0fc5a921037a845c46 (diff)
downloadbugzilla-2ca283e7bfc85d86ffd5f312bbab89eedcf9929b.tar.gz
bugzilla-2ca283e7bfc85d86ffd5f312bbab89eedcf9929b.tar.xz
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
-rw-r--r--Bugzilla/DB/Schema.pm6
-rw-r--r--Bugzilla/Install/DB.pm6
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 #