From 50538fb524950798cd8896f693909bdbc620bd8e Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Fri, 4 Apr 2008 12:06:22 +0000 Subject: Don't double include DISTINCT when the user has already specified it. Closes #11502 [kenneth.kalmer] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9223 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/test/cases/calculations_test.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/calculations_test.rb b/activerecord/test/cases/calculations_test.rb index 1771065a66..0ed40b469d 100644 --- a/activerecord/test/cases/calculations_test.rb +++ b/activerecord/test/cases/calculations_test.rb @@ -241,6 +241,10 @@ class CalculationsTest < ActiveRecord::TestCase assert_equal 4, Account.count(:distinct => true, :include => :firm, :select => :credit_limit) end + def test_should_count_manual_select_with_include + assert_equal 6, Account.count(:select => "DISTINCT accounts.id", :include => :firm) + end + def test_count_with_column_parameter assert_equal 5, Account.count(:firm_id) end -- cgit v1.2.3