diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-06 03:06:36 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-04-06 03:06:36 +0000 |
| commit | dcee137c7b0998b1533c5a028faf5a736078ade3 (patch) | |
| tree | a1a8ec4509138dda37e55c1b3b43d602cf425db9 | |
| parent | 2fa5bf03dd0105a70402b1abcf0ac3df54140a55 (diff) | |
| download | rails-dcee137c7b0998b1533c5a028faf5a736078ade3.tar.gz rails-dcee137c7b0998b1533c5a028faf5a736078ade3.tar.bz2 rails-dcee137c7b0998b1533c5a028faf5a736078ade3.zip | |
Fix HasManyAssociation#find bugs when :finder_sql is set (closes #4600) [lagroue@free.fr]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 2831c377bb..f3139eceba 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed HasManyAssociation#find bugs when :finder_sql is set #4600 [lagroue@free.fr] + * Allow AR::Base#respond_to? to behave when @attributes is nil [zenspider] * Support eager includes when going through a polymorphic has_many association. [Rick] diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index 8d82de0d01..52cad79484 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -59,7 +59,7 @@ module ActiveRecord if ids.size == 1 id = ids.first record = load_target.detect { |record| id == record.id } - expects_array? ? [record] : record + expects_array ? [ record ] : record else load_target.select { |record| ids.include?(record.id) } end |