Changeset 4493

Timestamp:

06/25/06 17:49:24 (2 years ago)

Author:

ulysses

Message:

Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum. Closes #5500.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_collection.rb (modified) (1 diff)
• trunk/activerecord/test/calculations_test.rb (modified) (1 diff)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add AssociationCollection#sum since the method_missing invokation has been shadowed by Enumerable#sum.
-
-* Added find_or_initialize_by_X which works like find_or_create_by_X but doesn't save the newly instantiated record. [Sam Stephenson]

trunk/activerecord/lib/active_record/associations/association_collection.rb

@@ -41 +41 @@
-        delete(@target)
-        reset_target!
+      end
+
+      # Calculate sum using SQL, not Enumerable
+      def sum(*args, &block)
+        calculate(:sum, *args, &block)
-      end
-

trunk/activerecord/test/calculations_test.rb

@@ -148 +148 @@
-    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