diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-28 20:42:01 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-28 20:42:01 +0000 |
| commit | 5dee6ce9e0e31c86c4319c17a1ee551832ecb7a8 (patch) | |
| tree | a56b21361b4135dfe7626c471000afc574e21110 /activerecord/lib/active_record/association_preload.rb | |
| parent | d6e355d1dfe483b93c0d37b74e8ad8405a1b7505 (diff) | |
| download | rails-5dee6ce9e0e31c86c4319c17a1ee551832ecb7a8.tar.gz rails-5dee6ce9e0e31c86c4319c17a1ee551832ecb7a8.tar.bz2 rails-5dee6ce9e0e31c86c4319c17a1ee551832ecb7a8.zip | |
Fix that batched :include would pull in duplicate records in some cases. Closes #11215 [Catfish]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8942 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/association_preload.rb')
| -rw-r--r-- | activerecord/lib/active_record/association_preload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index a89f5f5459..cc657dc433 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -10,7 +10,7 @@ module ActiveRecord # preload_options is passed only one level deep: don't pass to the child associations when associations is a Hash protected def preload_associations(records, associations, preload_options={}) - records = [records].flatten.compact + records = [records].flatten.compact.uniq return if records.empty? case associations when Array then associations.each {|association| preload_associations(records, association, preload_options)} |