From fa34acec20574699c2de19d97f9ae54f540fe69d Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Wed, 9 May 2012 08:52:44 -0300 Subject: Stop showing deprecations for Ruby 1.8.7 with remove_column String is Enumerable in 1.8.7, which means that passing a String to remove_column was generating deprecation warnings during tests. --- activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb') diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 91929f80d2..00f74318c0 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -408,13 +408,13 @@ module ActiveRecord def remove_column(table_name, *column_names) #:nodoc: raise ArgumentError.new("You must specify at least one column name. Example: remove_column(:people, :first_name)") if column_names.empty? - if column_names.first.kind_of?(Enumerable) + if column_names.flatten! message = 'Passing array to remove_columns is deprecated, please use ' + 'multiple arguments, like: `remove_columns(:posts, :foo, :bar)`' ActiveSupport::Deprecation.warn message, caller end - column_names.flatten.each do |column_name| + column_names.each do |column_name| alter_table(table_name) do |definition| definition.columns.delete(definition[column_name]) end -- cgit v1.2.3