Skip to content
Browse files

Deprecate remove_column with array as an argument

  • Loading branch information...
1 parent 5fe88b1 commit 02ca9151a043a4fefbb3f22edd05f0cd392fffaa @drogus drogus committed
View
6 activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -269,6 +269,12 @@ def add_column(table_name, column_name, type, options = {})
# remove_column(:suppliers, :qualification)
# remove_columns(:suppliers, :qualification, :experience)
def remove_column(table_name, *column_names)
+ if column_names.first.kind_of?(Enumerable)
+ 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}" }
end
alias :remove_columns :remove_column
View
7 activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -407,6 +407,13 @@ def add_column(table_name, column_name, type, options = {}) #:nodoc:
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)
+ 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|
alter_table(table_name) do |definition|
definition.columns.delete(definition[column_name])
View
6 activerecord/test/cases/migration_test.rb
@@ -873,6 +873,12 @@ def test_remove_column_no_second_parameter_raises_exception
assert_raise(ArgumentError) { Person.connection.remove_column("funny") }
end
+ def test_remove_column_with_array_as_an_argument_is_deprecated
+ assert_deprecated /Passing array to remove_columns is deprecated/ do
+ Person.connection.remove_column("people", ["last_name", "description"])
+ end
+ end
+
def test_change_type_of_not_null_column
assert_nothing_raised do
Topic.connection.change_column "topics", "written_on", :datetime, :null => false

0 comments on commit 02ca915

Please sign in to comment.
Something went wrong with that request. Please try again.