0
@@ -9,7 +9,7 @@ module ActiveRecord
0
           @reflection.klass.count_by_sql(@finder_sql)
0
         else
0
           column_name, options = @reflection.klass.send(:construct_count_options_from_args, *args)          
0
-          options[:conditions] = options[:conditions].nil? ?
0
+          options[:conditions] = options[:conditions].blank? ?
0
             @finder_sql :
0
             @finder_sql + " AND (#{sanitize_sql(options[:conditions])})"
0
           options[:include] ||= @reflection.options[:include]

0
@@ -32,6 +32,10 @@ class HasManyAssociationsTest < ActiveRecord::TestCase
0
     assert_equal 2, Firm.find(:first).plain_clients.count
0
   end
0
 
0
+  def test_counting_with_empty_hash_conditions
0
+    assert_equal 2, Firm.find(:first).plain_clients.count(:conditions => {})
0
+  end
0
+
0
   def test_counting_with_single_conditions
0
     assert_equal 2, Firm.find(:first).plain_clients.count(:conditions => '1=1')
0
   end