Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tests proving #5441

  • Loading branch information...
commit 43f404ed6e485c0f360addd92ad4692c0c469d65 1 parent b081758
@be9 be9 authored tenderlove committed
Showing with 11 additions and 1 deletion.
  1. +11 −1 activerecord/test/cases/calculations_test.rb
View
12 activerecord/test/cases/calculations_test.rb
@@ -275,6 +275,17 @@ def test_count_with_column_and_options_parameter
assert_equal 2, Account.count(:firm_id, :conditions => "credit_limit = 50 AND firm_id IS NOT NULL")
end
+ def test_should_count_field_in_joined_table
+ assert_equal 5, Account.count('companies.id', :joins => :firm)
+ assert_equal 4, Account.count('companies.id', :joins => :firm, :distinct => true)
+ end
+
+ def test_should_count_field_in_joined_table_with_group_by
+ c = Account.count('companies.id', :group => :firm_id, :joins => :firm)
+
+ [1,6,2,9].each { |firm_id| assert c.keys.include?(firm_id) }
+ end
+
def test_count_with_no_parameters_isnt_deprecated
assert_not_deprecated { Account.count }
end
@@ -335,5 +346,4 @@ def test_from_option_with_specified_index
def test_from_option_with_table_different_than_class
assert_equal Account.count(:all), Company.count(:all, :from => 'accounts')
end
-
end
Please sign in to comment.
Something went wrong with that request. Please try again.