aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-09 09:34:32 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-05-09 09:34:32 -0700
commit8f5079f190c849b2fb4de24739af742cc5a9e37b (patch)
treeb018f3696cb55acd191c63816f0739b828c8a433 /activerecord
parentb003ddf2aea1cec218604b62843faefef4b62a22 (diff)
parentba48e230c607016b2c92679173e5e7603fa6204c (diff)
downloadrails-8f5079f190c849b2fb4de24739af742cc5a9e37b.tar.gz
rails-8f5079f190c849b2fb4de24739af742cc5a9e37b.tar.bz2
rails-8f5079f190c849b2fb4de24739af742cc5a9e37b.zip
Merge pull request #6219 from frodsan/fix_build
Fix build - 3.2
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/migration_test.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 8dde6c6b5a..a448e0af9d 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -874,9 +874,17 @@ if ActiveRecord::Base.connection.supports_migrations?
end
def test_remove_column_with_array_as_an_argument_is_deprecated
+ ActiveRecord::Base.connection.create_table(:hats) do |table|
+ table.column :hat_name, :string, :limit => 100
+ table.column :hat_size, :integer
+ table.column :hat_style, :string, :limit => 100
+ end
+
assert_deprecated /Passing array to remove_columns is deprecated/ do
- Person.connection.remove_column("people", ["last_name", "description"])
+ Person.connection.remove_column("hats", ["hat_name", "hat_size"])
end
+ ensure
+ ActiveRecord::Base.connection.drop_table(:hats)
end
def test_change_type_of_not_null_column