Be sure to use the @finder_sql in the has_many association's #find method, even if explicit conditions have not been given.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1412 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 5 insertions, 5 deletions

diff --git a/activerecord/test/inheritance_test.rb b/activerecord/test/inheritance_test.rb
index e595ed1e92..d46d0d406b 100755
--- a/activerecord/test/inheritance_test.rb
+++ b/activerecord/test/inheritance_test.rb
@@ -48,9 +48,9 @@ class InheritanceTest < Test::Unit::TestCase
   end
 
   def test_inheritance_condition
-    assert_equal 3, Company.find_all.length
-    assert_equal 1, Firm.find_all.length
-    assert_equal 2, Client.find_all.length
+    assert_equal 5, Company.find_all.length
+    assert_equal 2, Firm.find_all.length
+    assert_equal 3, Client.find_all.length
   end
   
   def test_alt_inheritance_condition
@@ -82,7 +82,7 @@ class InheritanceTest < Test::Unit::TestCase
   def test_destroy_all_within_inheritance
     Client.destroy_all
     assert_equal 0, Client.find_all.length
-    assert_equal 1, Firm.find_all.length
+    assert_equal 2, Firm.find_all.length
   end
   
   def test_alt_destroy_all_within_inheritance
@@ -132,4 +132,4 @@ class InheritanceTest < Test::Unit::TestCase
     
       def Company.inheritance_column() "ruby_type" end
     end
-end
\ No newline at end of file
+end