Ticket #5500: enumerable_calculations_sum_fix.diff

test/calculations_test.rb

@@ -147 +147 @@
-    assert_equal 3, c['CLIENT']
-    assert_equal 2, c['FIRM']
-  end
+  
+  def test_should_not_overshadow_enumerable_sum
+    assert_equal 6, [1, 2, 3].sum(&:abs)
+  end
-
-  def test_should_sum_scoped_field
-    assert_equal 15, companies(:rails_core).companies.sum(:id)

lib/active_record/associations/association_collection.rb

@@ -41 +41 @@
-        delete(@target)
-        reset_target!
-      end
+      
+      # Calculate sum using SQL, not Enumerable
+      def sum(*args)
+        calculate(:sum, *args)
+      end
-
-      # Remove +records+ from this association.  Does not destroy +records+.
-      def delete(*records)