diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-12-03 04:01:14 -0800 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-12-03 04:01:14 -0800 |
| commit | a02691ce09c327e307a02f757c89d3cbd4d5ee56 (patch) | |
| tree | c8ca27ce6dc896334c2980c6fd85a1304af80260 /activerecord/lib/active_record | |
| parent | 2e902d52ebc70a121ef49cc042672b4facab16fa (diff) | |
| parent | 24b8814db0fb3660db2e5bc7067759674b3e3f37 (diff) | |
| download | rails-a02691ce09c327e307a02f757c89d3cbd4d5ee56.tar.gz rails-a02691ce09c327e307a02f757c89d3cbd4d5ee56.tar.bz2 rails-a02691ce09c327e307a02f757c89d3cbd4d5ee56.zip | |
Merge pull request #3820 from jaylevitt/nested_loading_through_assoc
reintroduce patch from #726 to handle nested eager loading via associations
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/join_dependency.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb index 6c878f0f00..827b01c5ac 100644 --- a/activerecord/lib/active_record/associations/join_dependency.rb +++ b/activerecord/lib/active_record/associations/join_dependency.rb @@ -184,7 +184,7 @@ module ActiveRecord macro = join_part.reflection.macro if macro == :has_one - return if record.association_cache.key?(join_part.reflection.name) + return record.association(join_part.reflection.name).target if record.association_cache.key?(join_part.reflection.name) association = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil? set_target_and_inverse(join_part, association, record) else |