each to each_value; remove unused vars

rails · Apr 7, 2013 · 4f5e8af · 4f5e8af
1 parent 136e3a4
commit 4f5e8af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/associations/preloader/has_many_through.rb b/activerecord/lib/active_record/associations/preloader/has_many_through.rb
@@ -5,7 +5,7 @@ class HasManyThrough < CollectionAssociation #:nodoc:
         include ThroughAssociation
 
         def associated_records_by_owner
-          super.each do |owner, records|
+          super.each_value do |records|
             records.uniq! if reflection_scope.distinct_value
           end
         end

diff --git a/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb b/activerecord/test/cases/adapters/sqlite3/copy_table_test.rb
@@ -54,7 +54,7 @@ def test_copy_table_without_primary_key
   end
 
   def test_copy_table_with_id_col_that_is_not_primary_key
-    test_copy_table('goofy_string_id', 'goofy_string_id2') do |from, to, options|
+    test_copy_table('goofy_string_id', 'goofy_string_id2') do
       original_id = @connection.columns('goofy_string_id').detect{|col| col.name == 'id' }
       copied_id = @connection.columns('goofy_string_id2').detect{|col| col.name == 'id' }
       assert_equal original_id.type, copied_id.type
@@ -65,7 +65,7 @@ def test_copy_table_with_id_col_that_is_not_primary_key
   end
 
   def test_copy_table_with_unconventional_primary_key
-    test_copy_table('owners', 'owners_unconventional') do |from, to, options|
+    test_copy_table('owners', 'owners_unconventional') do
       original_pk = @connection.primary_key('owners')
       copied_pk = @connection.primary_key('owners_unconventional')
       assert_equal original_pk, copied_pk