Bug 1082106 - avoid problem where ->bz_add_columns creates a foreign key…

Bug 1082106 - avoid problem where ->bz_add_columns creates a foreign key constraint causing failure in checksetup.pl when it tries to re-add it later. r,a=glob

Bug 1082106 - avoid problem where ->bz_add_columns creates a foreign key…
89b7de13 · David Lawrence · Gervase Markham · 44074798 · 89b7de13
Commit 89b7de13 authored Dec 11, 2014 by David Lawrence Committed by Gervase Markham Dec 11, 2014
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

DB.pm Bugzilla/DB.pm +4 -1

No files found.
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -581,8 +581,11 @@ sub bz_add_column {
    my $current_def = $self->bz_column_info($table, $name);

    if (!$current_def) {
+        # REFERENCES need to happen later and not be created right away
+        my $trimmed_def = dclone($new_def);
+        delete $trimmed_def->{REFERENCES};
        my @statements = $self->_bz_real_schema->get_add_column_ddl(
-            $table, $name, $new_def, 
+            $table, $name, $trimmed_def,
            defined $init_value ? $self->quote($init_value) : undef);
        print get_text('install_column_add',
                       { column => $name, table => $table }) . "\n"