Improve associations performance by avoiding named block arguments. Closes #11109

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 5 deletions

diff --git a/activerecord/lib/active_record/associations/has_many_through_association.rb b/activerecord/lib/active_record/associations/has_many_through_association.rb
index 94842f424d..23931bcda2 100644
--- a/activerecord/lib/active_record/associations/has_many_through_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_through_association.rb
@@ -113,8 +113,8 @@ module ActiveRecord
       end
 
       # Calculate sum using SQL, not Enumerable
-      def sum(*args, &block)
-        calculate(:sum, *args, &block)
+      def sum(*args)
+        calculate(:sum, *args) { |*block_args| yield(*block_args) if block_given? }
       end
       
       def count(*args)
@@ -128,11 +128,13 @@ module ActiveRecord
       end
 
       protected
-        def method_missing(method, *args, &block)
+        def method_missing(method, *args)
           if @target.respond_to?(method) || (!@reflection.klass.respond_to?(method) && Class.respond_to?(method))
-            super
+            super { |*block_args| yield(*block_args) if block_given? }
           else
-            @reflection.klass.send(:with_scope, construct_scope) { @reflection.klass.send(method, *args, &block) }
+            @reflection.klass.send(:with_scope, construct_scope) {
+                @reflection.klass.send(method, *args) { |*block_args| yield(*block_args) if block_given? }
+            }
           end
         end