diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-05 09:41:09 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-05 09:41:09 -0700 |
| commit | b27871a66fc1568dba08a4fbc1e6f20dec5dccab (patch) | |
| tree | db3e72850658c042bb54a4d8d0d33772be64d7c6 /activerecord/lib | |
| parent | eb2e109b7e60bb8fa524558336f58a547473063d (diff) | |
| parent | 8ba0c1ac5315c24cd7132267152b9d126c6ddf52 (diff) | |
| download | rails-b27871a66fc1568dba08a4fbc1e6f20dec5dccab.tar.gz rails-b27871a66fc1568dba08a4fbc1e6f20dec5dccab.tar.bz2 rails-b27871a66fc1568dba08a4fbc1e6f20dec5dccab.zip | |
Merge pull request #1968 from bogdan/associations_find_array_compatibility2
Fixed CollectionAssociation#find to be compatible with Array#find
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 224e0095d9..c15ee18e53 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -78,10 +78,14 @@ module ActiveRecord end def find(*args) - if options[:finder_sql] - find_by_scan(*args) + if block_given? + load_target.find(*args) { |*block_args| yield(*block_args) } else - scoped.find(*args) + if options[:finder_sql] + find_by_scan(*args) + else + scoped.find(*args) + end end end |