diff options
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/test/associations_go_eager_test.rb | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 649655b6a8..622499a91a 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* SQLServer: fix eager association test. #5901 [Tom Ward] + * Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance. #5838 [Kevin Clark] * Fixtures: correct escaping of \n and \r. #5859 [evgeny.zislis@gmail.com] diff --git a/activerecord/test/associations_go_eager_test.rb b/activerecord/test/associations_go_eager_test.rb index ddcd72d045..bcdd63ce34 100644 --- a/activerecord/test/associations_go_eager_test.rb +++ b/activerecord/test/associations_go_eager_test.rb @@ -358,6 +358,10 @@ class EagerAssociationTest < Test::Unit::TestCase end def test_count_with_include - assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(comments.body) > 15") + if current_adapter?(:SQLServerAdapter) + assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "len(comments.body) > 15") + else + assert_equal 3, authors(:david).posts_with_comments.count(:conditions => "length(comments.body) > 15") + end end end |