Changeset 8778

Timestamp:

02/02/08 04:28:42 (7 months ago)

Author:

bitsweat

Message:

Fix calculations on associations with custom :foreign_key. Closes #8117 [kamal, jack]

Files:

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

trunk/activerecord/lib/active_record/calculations.rb

@@ -214 +214 @@
-          association     = reflect_on_association(group_attr.to_sym)
-          associated      = association && association.macro == :belongs_to # only count belongs_to associations
-(associated ? "#{options[:group]}_id" : options[:group]).to_s
+associated ? association.primary_key_name : group_attr
-          group_alias     = column_alias_for(group_field)
-          group_column    = column_for group_field

trunk/activerecord/test/cases/calculations_test.rb

@@ -159 +159 @@
-      assert_equal 1, c.first.last
-    end
+  end
+
+  def test_should_calculate_grouped_association_with_foreign_key_option
+    Account.belongs_to :another_firm, :class_name => 'Firm', :foreign_key => 'firm_id'
+    c = Account.count(:all, :group => :another_firm)
+    assert_equal 1, c[companies(:first_firm)]
+    assert_equal 2, c[companies(:rails_core)]
+    assert_equal 1, c[companies(:first_client)]
-  end
-