aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-04-11 08:35:09 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-04-11 08:35:09 -0700
commit53d6cc04e73d5e9a0ec334bdfdce8f272005564f (patch)
tree31137f8327328702522c6755df5ecf5e6a876b2c /activerecord
parent2e3f5191f05dbd072194bf47564a51bfa4cbf0d5 (diff)
parent0997a14baea5d01fa2083f5bc4c320988f6706ce (diff)
downloadrails-53d6cc04e73d5e9a0ec334bdfdce8f272005564f.tar.gz
rails-53d6cc04e73d5e9a0ec334bdfdce8f272005564f.tar.bz2
rails-53d6cc04e73d5e9a0ec334bdfdce8f272005564f.zip
Merge pull request #10177 from yahonda/test_relation_merging_with_merged_joins_oracle
Address ORA-00979: not a GROUP BY expression error
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/relation_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 1967d8716a..34ecdb3cc9 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -182,7 +182,7 @@ module ActiveRecord
def test_relation_merging_with_merged_joins
special_comments_with_ratings = SpecialComment.joins(:ratings)
posts_with_special_comments_with_ratings = Post.group("posts.id").joins(:special_comments).merge(special_comments_with_ratings)
- assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).to_a.length
+ assert_equal 3, authors(:david).posts.merge(posts_with_special_comments_with_ratings).count.length
end
end