aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-26 10:42:15 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-26 10:42:15 -0700
commitaf6abc6404561770f7109fa4cd62c48e81c33651 (patch)
tree2ed35e819df31d0ff46ab0cfa306955b2eaddf56
parentbdbf97c23b4e1cceea9e814c40696fd7fafce642 (diff)
parentcf3f1c9ba8d7c663fedb9fad9895dea5c7675c1c (diff)
downloadrails-af6abc6404561770f7109fa4cd62c48e81c33651.tar.gz
rails-af6abc6404561770f7109fa4cd62c48e81c33651.tar.bz2
rails-af6abc6404561770f7109fa4cd62c48e81c33651.zip
Merge pull request #2281 from castlerock/remove_warnings_ruby193
remove deprication warning for ruby 1.9.3-head for unused variable
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index d6c167ad36..f9602bbe77 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -577,7 +577,7 @@ module ActiveRecord
def quoted_columns_for_index(column_names, options = {})
length = options[:length] if options.is_a?(Hash)
- quoted_column_names = case length
+ case length
when Hash
column_names.map {|name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
when Fixnum