diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-10 22:19:38 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-10 22:37:36 -0700 |
commit | 86dda361e2363e27d39cc66d490335d9c7126c7b (patch) | |
tree | 0eac0be11b5ad9137d4e5647b21dfd3bf4036151 /activerecord/lib/active_record/connection_adapters/abstract | |
parent | 61355c0e243c4b6d9324479c96ef31e922f0355b (diff) | |
download | rails-86dda361e2363e27d39cc66d490335d9c7126c7b.tar.gz rails-86dda361e2363e27d39cc66d490335d9c7126c7b.tar.bz2 rails-86dda361e2363e27d39cc66d490335d9c7126c7b.zip |
Avoid deprecated String#to_a by using Array.wrap(...) instead of Array(...)
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 6 |
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 6d4ab501fa..e8cba1bd41 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/array/wrap' + module ActiveRecord module ConnectionAdapters # :nodoc: module SchemaStatements @@ -267,7 +269,7 @@ module ActiveRecord # generates # CREATE UNIQUE INDEX by_branch_party ON accounts(branch_id, party_id) def add_index(table_name, column_name, options = {}) - column_names = Array(column_name) + column_names = Array.wrap(column_name) index_name = index_name(table_name, :column => column_names) if Hash === options # legacy support, since this param was a string @@ -297,7 +299,7 @@ module ActiveRecord def index_name(table_name, options) #:nodoc: if Hash === options # legacy support if options[:column] - "index_#{table_name}_on_#{Array(options[:column]) * '_and_'}" + "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" elsif options[:name] options[:name] else |