aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-29 14:18:54 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-12-29 14:18:54 -0300
commit266ff700011dfcc4b76a7332bbfa64d9419c10bc (patch)
tree486ddf150e580c3381c5a807a6de94aa5e5abaa8 /activerecord/lib
parent0906e8322b81c429fddeb89ab08c279719bf29b0 (diff)
parent068160b444a5ceccd0bdc5dd81b70bc45754bcaa (diff)
downloadrails-266ff700011dfcc4b76a7332bbfa64d9419c10bc.tar.gz
rails-266ff700011dfcc4b76a7332bbfa64d9419c10bc.tar.bz2
rails-266ff700011dfcc4b76a7332bbfa64d9419c10bc.zip
Merge pull request #18097 from k0kubun/readonly-eager_load
`eager_load` preserves readonly flag for associations
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index cf63430a97..6c1c700d54 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -257,6 +257,7 @@ module ActiveRecord
construct(model, node, row, rs, seen, model_cache, aliases)
else
model = construct_model(ar_parent, node, row, model_cache, id, aliases)
+ model.readonly!
seen[parent.base_klass][primary_id][node.base_klass][id] = model
construct(model, node, row, rs, seen, model_cache, aliases)
end