Changeset 6919

Timestamp:

06/01/07 03:26:51 (2 years ago)

Author:

bitsweat

Message:

Calculations support non-numeric foreign keys. Closes #8154.

Files:

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

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Calculations support non-numeric foreign keys.  #8154 [kamal]
-
-* with_scope is protected.  #8524 [Josh Peek]

trunk/activerecord/lib/active_record/calculations.rb

@@ -236 +236 @@
-
-          calculated_data.inject(ActiveSupport::OrderedHash.new) do |all, row|
-
+
+
-            value = row[aggregate_alias]
-            all << [key, type_cast_calculated_value(value, column, operation)]

trunk/activerecord/test/calculations_test.rb

@@ -139 +139 @@
-    assert_equal 2, c[companies(:rails_core)]
-    assert_equal 1, c[companies(:first_client)]
+  end
+
+  uses_mocha 'group_by_non_numeric_foreign_key_association' do
+    def test_should_group_by_association_with_non_numeric_foreign_key
+      ActiveRecord::Base.connection.expects(:select_all).returns([{"count_all" => 1, "firm_id" => "ABC"}])
+
+      firm = mock()
+      firm.expects(:id).returns("ABC")
+      firm.expects(:class).returns(Firm)
+      Company.expects(:find).with(["ABC"]).returns([firm])
+
+      column = mock()
+      column.expects(:name).at_least_once.returns(:firm_id)
+      column.expects(:type_cast).with("ABC").returns("ABC")
+      Account.expects(:columns).at_least_once.returns([column])
+
+      c = Account.count(:all, :group => :firm)
+      assert_equal Firm, c.first.first.class
+      assert_equal 1, c.first.last
+    end
-  end
-