diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-27 13:12:47 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-02-27 13:12:47 -0800 |
commit | a1f18d3d722430d83783763eebe25fb05e8ce55c (patch) | |
tree | 616e76af480536f3f09f4ff831434d24dc94974a /activerecord | |
parent | 6a65a8caf38fb7a46521ffbc66ea6f375a0add89 (diff) | |
parent | c27da1fbcc243613949c682c44f05fffa71519c4 (diff) | |
download | rails-a1f18d3d722430d83783763eebe25fb05e8ce55c.tar.gz rails-a1f18d3d722430d83783763eebe25fb05e8ce55c.tar.bz2 rails-a1f18d3d722430d83783763eebe25fb05e8ce55c.zip |
Merge pull request #9472 from yahonda/revert_7544c7a9
Revert "Skip test_remove_column_with_array_as_an_argument_is_deprecated ...
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/test/cases/migration_test.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb index 120948a528..7f0d921545 100644 --- a/activerecord/test/cases/migration_test.rb +++ b/activerecord/test/cases/migration_test.rb @@ -874,8 +874,6 @@ if ActiveRecord::Base.connection.supports_migrations? end def test_remove_column_with_array_as_an_argument_is_deprecated - return skip "remove_column with array as argument is not supported with OracleAdapter" if current_adapter? :OracleAdapter - ActiveRecord::Base.connection.create_table(:hats) do |table| table.column :hat_name, :string, :limit => 100 table.column :hat_size, :integer @@ -886,7 +884,7 @@ if ActiveRecord::Base.connection.supports_migrations? Person.connection.remove_column("hats", ["hat_name", "hat_size"]) end ensure - ActiveRecord::Base.connection.drop_table(:hats) rescue nil + ActiveRecord::Base.connection.drop_table(:hats) end def test_removing_and_renaming_column_preserves_custom_primary_key |