diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-12-31 02:44:27 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-12-31 02:47:37 +0530 |
| commit | bb17c3b2105da30ef3260c3b489da85e4865eaa5 (patch) | |
| tree | 8c3e4db574a16ca37cd31072f83ce3ec712101f5 /activerecord/lib/active_record/associations | |
| parent | 15e2eb42a7b1c251defd088ac65a89f152a307f6 (diff) | |
| download | rails-bb17c3b2105da30ef3260c3b489da85e4865eaa5.tar.gz rails-bb17c3b2105da30ef3260c3b489da85e4865eaa5.tar.bz2 rails-bb17c3b2105da30ef3260c3b489da85e4865eaa5.zip | |
https://github.com/rails/rails/commit/2075f39d726cef361170218fd16421fc52bed5a8 introduced a regression in includes/preloades
by calling `read_attribute` on an association when preloading takes places, instead of using loaded records in `association.target`.
tl;dr
Records are not made properly available via `read_attribute` when preloding in simultaneous,
but value of `@loaded` is already set true, and records concatenated in `association.target` on an association object.
When `@loaded` is true we return an object of `AlreadyLoaded` in preload_for. In `AlreadyLoaded` to return preloaded
records we make wrong use of `read_attribute`, instead of `target` records.
The regression is fixed by making use of the loaded records in `association.target` when the preloading takes place.
Fixes #13437
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/preloader.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/preloader.rb b/activerecord/lib/active_record/associations/preloader.rb index 2393667ac8..83637a0409 100644 --- a/activerecord/lib/active_record/associations/preloader.rb +++ b/activerecord/lib/active_record/associations/preloader.rb @@ -183,7 +183,7 @@ module ActiveRecord def run(preloader); end def preloaded_records - owners.flat_map { |owner| owner.read_attribute reflection.name } + owners.flat_map { |owner| owner.association(reflection.name).target } end end |