From: Frédéric Buclin Date: Tue, 24 Jan 2012 17:41:55 +0000 (+0100) Subject: Bug 715870: [Oracle] Related sequences and triggers must be removed when dropping... X-Git-Tag: bugzilla-4.2rc2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2a95ffbe2beb52bf3e69102b4646ddf5793d8df;p=thirdparty%2Fbugzilla.git Bug 715870: [Oracle] Related sequences and triggers must be removed when dropping a table r=mkanat a=LpSolit --- diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm index cdc39409d8..f2d5b8be02 100644 --- a/Bugzilla/DB/Schema/Oracle.pm +++ b/Bugzilla/DB/Schema/Oracle.pm @@ -386,13 +386,31 @@ sub get_rename_table_sql { } if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL}) { push(@sql, _get_notnull_trigger_ddl($new_name, $column)); - push(@sql, "DROP TRIGGER ${$old_name}_${column}"); + push(@sql, "DROP TRIGGER ${old_name}_${column}"); } } return @sql; } +sub get_drop_table_ddl { + my ($self, $name) = @_; + my @sql; + + my @columns = $self->get_table_columns($name); + foreach my $column (@columns) { + my $def = $self->get_column_abstract($name, $column); + if ($def->{TYPE} =~ /SERIAL/i) { + # If there's a SERIAL column on this table, we also need + # to remove the sequence. + push(@sql, "DROP SEQUENCE ${name}_${column}_SEQ"); + } + } + push(@sql, "DROP TABLE $name CASCADE CONSTRAINTS PURGE"); + + return @sql; +} + sub _get_notnull_trigger_ddl { my ($table, $column) = @_;