diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 12:18:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-11 12:18:57 -0700 |
| commit | 2a0f2603d18064a1997b5c31a07b0e17edb1fbf5 (patch) | |
| tree | 09a618fc4c80e5dff3215b81e7ede5144a8b52dc /activerecord/test/cases | |
| parent | 802876854d23e7735c8647e0a7b90440db095d8a (diff) | |
| parent | 5cbed2bc606750c71ee231d2b816471fe241459e (diff) | |
| download | rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.tar.gz rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.tar.bz2 rails-2a0f2603d18064a1997b5c31a07b0e17edb1fbf5.zip | |
Merge pull request #12194 from thedarkone/readonly-merger-fix
Relation#merge should not lose readonly(false) flag.
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index a327b0d3e5..e77de19ac3 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -193,6 +193,14 @@ module ActiveRecord assert_equal ['foo = bar'], relation.where_values end + def test_merging_readonly_false + relation = Relation.new FakeKlass, :b + readonly_false_relation = relation.readonly(false) + # test merging in both directions + assert_equal false, relation.merge(readonly_false_relation).readonly_value + assert_equal false, readonly_false_relation.merge(relation).readonly_value + end + def test_relation_merging_with_merged_joins_as_symbols 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) |