diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2016-07-22 13:03:41 +0900 |
|---|---|---|
| committer | Ryuta Kamizono <kamipo@gmail.com> | 2016-12-25 04:55:51 +0900 |
| commit | f1217c605de2b089fd4fccb14c4d98b41a532c60 (patch) | |
| tree | 8a0af566ae35cad2862056dddd0e44a9b1854fea /activerecord/lib/active_record/associations | |
| parent | d1e0f11b49c9c7598efffbc44a94539b6e982e5c (diff) | |
| download | rails-f1217c605de2b089fd4fccb14c4d98b41a532c60.tar.gz rails-f1217c605de2b089fd4fccb14c4d98b41a532c60.tar.bz2 rails-f1217c605de2b089fd4fccb14c4d98b41a532c60.zip | |
No need to cache collection proxies separately
Because merging the association scope was removed.
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index f747491a12..7d43a984d1 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -38,13 +38,7 @@ module ActiveRecord reload end - if null_scope? - # Cache the proxy separately before the owner has an id - # or else a post-save proxy will still lack the id - @null_proxy ||= CollectionProxy.create(klass, self) - else - @proxy ||= CollectionProxy.create(klass, self) - end + CollectionProxy.create(klass, self) end # Implements the writer method, e.g. foo.items= for Foo.has_many :items |