aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-09 08:52:44 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-05-09 08:52:44 -0300
commitfa34acec20574699c2de19d97f9ae54f540fe69d (patch)
treedc37c85a77762bdcae529dab845ff4ed081e082a /activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
parentcb242a9e4808af7a2aab19832846e2947e39e4a0 (diff)
downloadrails-fa34acec20574699c2de19d97f9ae54f540fe69d.tar.gz
rails-fa34acec20574699c2de19d97f9ae54f540fe69d.tar.bz2
rails-fa34acec20574699c2de19d97f9ae54f540fe69d.zip
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.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index c3aba63e1c..08c3917d7e 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -269,13 +269,15 @@ module ActiveRecord
# remove_column(:suppliers, :qualification)
# remove_columns(:suppliers, :qualification, :experience)
def remove_column(table_name, *column_names)
- 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
- columns_for_remove(table_name, *column_names).each {|column_name| execute "ALTER TABLE #{quote_table_name(table_name)} DROP #{column_name}" }
+ columns_for_remove(table_name, *column_names).each do |column_name|
+ execute "ALTER TABLE #{quote_table_name(table_name)} DROP #{column_name}"
+ end
end
alias :remove_columns :remove_column