From cd976b8718816f5fff3cf7e4341671dcff8f8646 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Tue, 25 Mar 2008 03:50:40 +0000 Subject: [PATCH] Bug 419979: Bugzilla::DB::bz_add_field_table directly modifies the FIELD_TABLE_SCHEMA constant Patch By Max Kanat-Alexander r=LpSolit, a=mkanat --- Bugzilla/DB.pm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index 7a19f8fd42..ff3df50672 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -597,18 +597,21 @@ sub _bz_add_table_raw { sub bz_add_field_table { my ($self, $name) = @_; - my $table_schema = $self->_bz_schema->FIELD_TABLE_SCHEMA; # We do nothing if the table already exists. return if $self->bz_table_info($name); - my $indexes = $table_schema->{INDEXES}; - # $indexes is an arrayref, not a hash. In order to fix the keys, - # we have to fix every other item. - for (my $i = 0; $i < scalar @$indexes; $i++) { - next if ($i % 2 && $i != 0); # We skip 1, 3, 5, 7, etc. - $indexes->[$i] = $name . "_" . $indexes->[$i]; + + # Copy this so that we're not modifying the constant. + my %table_schema = %{ $self->_bz_schema->FIELD_TABLE_SCHEMA }; + my %indexes = @{ $table_schema{INDEXES} }; + my %fixed_indexes; + foreach my $key (keys %indexes) { + $fixed_indexes{$name . "_" . $key} = $indexes{$key}; } + # INDEXES is supposed to be an arrayref, so we have to convert back. + my @indexes_array = %fixed_indexes; + $table_schema{INDEXES} = \@indexes_array; # We add this to the abstract schema so that bz_add_table can find it. - $self->_bz_schema->add_table($name, $table_schema); + $self->_bz_schema->add_table($name, \%table_schema); $self->bz_add_table($name); } -- 2.47.2