Commit d71d64d9 authored by mkanat%kerio.com's avatar mkanat%kerio.com

Bug 287483: Sanitycheck screams about "Bad value 0 found in components.initialqacontact"

Patch By Teemu Mannermaa <wicked@etlicon.fi> r=mkanat, a=myk
parent 9e7eef7d
...@@ -3838,8 +3838,14 @@ add_setting ("display_quips", {"on" => 1, "off" => 2 }, "on" ); ...@@ -3838,8 +3838,14 @@ add_setting ("display_quips", {"on" => 1, "off" => 2 }, "on" );
if (!$dbh->bz_get_field_def('bugs', 'qa_contact')->[2]) { # if it's NOT NULL if (!$dbh->bz_get_field_def('bugs', 'qa_contact')->[2]) { # if it's NOT NULL
$dbh->bz_change_field_type('bugs', 'qa_contact', 'mediumint'); $dbh->bz_change_field_type('bugs', 'qa_contact', 'mediumint');
$dbh->do("UPDATE bugs SET qa_contact = NULL WHERE qa_contact = 0"); $dbh->do("UPDATE bugs SET qa_contact = NULL WHERE qa_contact = 0");
$dbh->do("UPDATE components SET initialqacontact = NULL }
WHERE initialqacontact = 0");
# 2005-03-27 initialqacontact should be NULL instead of 0, bug 287483
if (!$dbh->bz_get_field_def('components',
'initialqacontact')->[2]) { # if it's NOT NULL
$dbh->bz_change_field_type('components', 'initialqacontact', 'mediumint');
$dbh->do("UPDATE components SET initialqacontact = NULL " .
"WHERE initialqacontact = 0");
} }
# 2005-03-29 - gerv@gerv.net - bug 73665. # 2005-03-29 - gerv@gerv.net - bug 73665.
......
...@@ -305,6 +305,8 @@ if ($action eq 'new') { ...@@ -305,6 +305,8 @@ if ($action eq 'new') {
{'name' => $component}); {'name' => $component});
} }
} }
my $initialqacontactsql =
$initialqacontact ne '' ? SqlQuote($initialqacontactid) : 'NULL';
# Add the new component # Add the new component
SendSQL("INSERT INTO components ( " . SendSQL("INSERT INTO components ( " .
...@@ -314,7 +316,7 @@ if ($action eq 'new') { ...@@ -314,7 +316,7 @@ if ($action eq 'new') {
SqlQuote($component) . "," . SqlQuote($component) . "," .
SqlQuote($description) . "," . SqlQuote($description) . "," .
SqlQuote($initialownerid) . "," . SqlQuote($initialownerid) . "," .
SqlQuote($initialqacontactid) . ")"); $initialqacontactsql . ")");
# Insert default charting queries for this product. # Insert default charting queries for this product.
# If they aren't using charting, this won't do any harm. # If they aren't using charting, this won't do any harm.
...@@ -611,9 +613,11 @@ if ($action eq 'update') { ...@@ -611,9 +613,11 @@ if ($action eq 'update') {
ThrowUserError('component_need_valid_initialqacontact', ThrowUserError('component_need_valid_initialqacontact',
{'name' => $componentold}); {'name' => $componentold});
} }
my $initialqacontactsql =
$initialqacontact ne '' ? SqlQuote($initialqacontactid) : 'NULL';
SendSQL("UPDATE components SendSQL("UPDATE components
SET initialqacontact=" . SqlQuote($initialqacontactid) . " SET initialqacontact = $initialqacontactsql
WHERE id = $component_id"); WHERE id = $component_id");
$vars->{'updated_initialqacontact'} = 1; $vars->{'updated_initialqacontact'} = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment