summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/DB/Schema.pm2
-rwxr-xr-xchecksetup.pl11
2 files changed, 12 insertions, 1 deletions
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 3d008a09b..9ef1f6214 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -832,7 +832,7 @@ use constant ABSTRACT_SCHEMA => {
PRIMARYKEY => 1},
name => {TYPE => 'varchar(64)', NOTNULL => 1},
product_id => {TYPE => 'INT2', NOTNULL => 1},
- initialowner => {TYPE => 'INT3'},
+ initialowner => {TYPE => 'INT3', NOTNULL => 1},
initialqacontact => {TYPE => 'INT3'},
description => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
],
diff --git a/checksetup.pl b/checksetup.pl
index fa8cf7354..f64bd350a 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3944,6 +3944,17 @@ add_setting ("comment_sort_order", {"oldest_to_newest" => 1,
$dbh->bz_change_field_type('products', 'classification_id',
'smallint NOT NULL DEFAULT 1');
+# initialowner was accidentally NULL when we checked-in Schema,
+# when it really should be NOT NULL.
+if ($dbh->bz_get_field_def('components', 'initialowner')->[2]) { # if NULL
+ # There's technically no way a real NULL could have gotten into
+ # initialowner, but better safe than sorry.
+ $dbh->do('UPDATE components SET initialowner = 0
+ WHERE initialowner IS NULL');
+ $dbh->bz_change_field_type('components', 'initialowner',
+ 'mediumint NOT NULL');
+}
+
} # END LEGACY CHECKS
# If you had to change the --TABLE-- definition in any way, then add your