diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-18 18:11:11 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-08-21 01:00:14 -0300 |
| commit | fdf4eae506fa9895e831f569bed3c4aa6a999a22 (patch) | |
| tree | 64f459809fd696218e6010d778324cbba7f7ee82 /activerecord/lib | |
| parent | b3bea4993896d9fb524a7c1f848fff6811e35297 (diff) | |
| download | rails-fdf4eae506fa9895e831f569bed3c4aa6a999a22.tar.gz rails-fdf4eae506fa9895e831f569bed3c4aa6a999a22.tar.bz2 rails-fdf4eae506fa9895e831f569bed3c4aa6a999a22.zip | |
Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_last_child
Use inversed parent for first and last child of has_many association
[Backport] Closes #3223.
Conflicts:
activerecord/lib/active_record/associations/collection_association.rb
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 8ef6b594fd..d929a45c92 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -569,7 +569,7 @@ module ActiveRecord args.shift if args.first.is_a?(Hash) && args.first.empty? collection = fetch_first_or_last_using_find?(args) ? scoped : load_target - collection.send(type, *args) + collection.send(type, *args).tap {|it| set_inverse_instance it } end end end |