diff options
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/DB/Schema/Oracle.pm | 20 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 5 |
2 files changed, 21 insertions, 4 deletions
diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm index cdc39409d..f2d5b8be0 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) = @_; diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index ef4bf3d22..1e7fc97c6 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -358,9 +358,8 @@ sub OPTIONAL_MODULES { { package => 'Apache-SizeLimit', module => 'Apache2::SizeLimit', - # 0.93 fixes problems on Linux and Windows, and changes the - # syntax used by SizeLimit. - version => '0.93', + # 0.96 properly determines process size on Linux. + version => '0.96', feature => ['mod_perl'], }, ); |