Skip to content

bugzilla
bugzilla
Commit c253b28a authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Additional fix for bug 508023, to make upgrades from 3.1.4 succeed.

parent 4d048661
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
Bugzilla/DB/Schema/Mysql.pm
View file @ c253b28a
...@@ -189,13 +189,15 @@ sub get_alter_column_ddl { ...@@ -189,13 +189,15 @@ sub get_alter_column_ddl {
my %new_defaultless = %$new_def; my %new_defaultless = %$new_def;
delete $old_defaultless{DEFAULT}; delete $old_defaultless{DEFAULT};
delete $new_defaultless{DEFAULT}; delete $new_defaultless{DEFAULT};
if ($self->columns_equal(\%new_defaultless, \%old_defaultless)) { if (!$self->columns_equal($old_def, $new_def)
if (defined $old_def->{DEFAULT} and !defined $new_def->{DEFAULT}) { && $self->columns_equal(\%new_defaultless, \%old_defaultless))
{
if (!defined $new_def->{DEFAULT}) {
push(@statements, push(@statements,
"ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT"); "ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT");
} }
else { else {
push(@statements, "ALTER TABLE $table ALTER COLUMN $column push(@statements, "ALTER TABLE $table ALTER COLUMN $column
SET DEFAULT " . $new_def->{DEFAULT}); SET DEFAULT " . $new_def->{DEFAULT});
} }
} }
......
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