diff options
author | David Lawrence <dkl@mozilla.com> | 2014-04-10 16:29:53 +0200 |
---|---|---|
committer | David Lawrence <dkl@mozilla.com> | 2014-04-10 16:29:53 +0200 |
commit | 94fd1545568688d8e2627c14dab6192942b6ed37 (patch) | |
tree | f4a679f16dd15b16cb03cb70edf7af0256a84b7e /Bugzilla/Install | |
parent | a2689d0747d489c5d6f1b073a829df7d69357bda (diff) | |
parent | ffad8c2a00a341fdea08187a836c4d4365b2556f (diff) | |
download | bugzilla-94fd1545568688d8e2627c14dab6192942b6ed37.tar.gz bugzilla-94fd1545568688d8e2627c14dab6192942b6ed37.tar.xz |
Merge branch '4.2' of ssh://git.mozilla.org/webtools/bmo/bugzilla into 4.2
Diffstat (limited to 'Bugzilla/Install')
-rw-r--r-- | Bugzilla/Install/DB.pm | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm index a217e0753..7ab533198 100644 --- a/Bugzilla/Install/DB.pm +++ b/Bugzilla/Install/DB.pm @@ -706,14 +706,6 @@ sub update_table_definitions { # 2013-08-16 glob@mozilla.com - Bug 905925 $dbh->bz_add_index('attachments', 'attachments_ispatch_idx', ['ispatch']); - # 2014-03-11 glob@mozilla.com - Bug 981756 (BMO only) - _fix_attachments_primary_key(); - if ($dbh->bz_column_info('bugs_activity', 'id')->{TYPE} ne 'BIGSERIAL') { - $dbh->bz_drop_related_fks('bugs_activity', 'id'); - $dbh->bz_alter_column('bugs_activity', 'id', - {TYPE => 'BIGSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); - } - ################################################################ # New --TABLE-- changes should go *** A B O V E *** this point # ################################################################ @@ -3745,21 +3737,6 @@ sub _fix_longdescs_primary_key { } } -sub _fix_attachments_primary_key { - my $dbh = Bugzilla->dbh; - if ($dbh->bz_column_info('attachments', 'attach_id')->{TYPE} ne 'BIGSERIAL') { - $dbh->bz_drop_related_fks('attachments', 'attach_id'); - $dbh->bz_alter_column('attach_data', 'id', {TYPE => 'INT5'}); - $dbh->bz_alter_column('bugs_activity', 'attach_id', {TYPE => 'INT5'}); - $dbh->bz_alter_column('flags', 'attach_id', {TYPE => 'INT5'}); - # the following two are bmo extensions - $dbh->bz_alter_column('flag_state_activity', 'attachment_id', {TYPE => 'INT5'}); - $dbh->bz_alter_column('autoland_attachments', 'attach_id', {TYPE => 'INT5'}); - $dbh->bz_alter_column('attachments', 'attach_id', - {TYPE => 'BIGSERIAL', NOTNULL => 1, PRIMARYKEY => 1}); - } -} - sub _fix_dependencies_dupes { my $dbh = Bugzilla->dbh; my $blocked_idx = $dbh->bz_index_info('dependencies', 'dependencies_blocked_idx'); |