diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-18 15:44:08 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-18 15:44:08 -0700 |
| commit | 2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16 (patch) | |
| tree | 8948c673b922e14008623dfb7d27692d5fa18d5b /activerecord/lib | |
| parent | 353a398bee68c5ea99d76ac7601de0a5fef6f4a5 (diff) | |
| parent | 2b73f780ffa52baba09511b2db753f0fde574c14 (diff) | |
| download | rails-2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16.tar.gz rails-2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16.tar.bz2 rails-2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16.zip | |
Merge pull request #10566 from neerajdotname/10509d
do not load all child records for inverse case
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 efd7ecb97c..9833822f8f 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -81,7 +81,7 @@ module ActiveRecord else if options[:finder_sql] find_by_scan(*args) - elsif options[:inverse_of] + elsif options[:inverse_of] && loaded? args = args.flatten raise RecordNotFound, "Couldn't find #{scope.klass.name} without an ID" if args.blank? |