github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactoring AST building

Browse Source
This commit is contained in:
Aaron Patterson
2010-12-25 14:34:13 -07:00
parent f855090a78
commit 3fe9951fcc
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
activerecord/lib/active_record/association_preload.rb
View File

@@ -217,13 +217,11 @@ module ActiveRecord
associated_records_proxy.joins_values = [join]
associated_records_proxy.select_values = select
method = ids.length > 1 ? 'in' : 'eq'
all_associated_records = associated_records(ids) do |some_ids|
method = some_ids.length == 1 ? ['eq', some_ids.first] :
['in', some_ids]
conditions = right[reflection.primary_key_name].send(
method, some_ids.length == 1 ? some_ids.first : some_ids
)
conditions = right[reflection.primary_key_name].send(*method)
conditions = conditions.and(custom_conditions) unless custom_conditions.empty?
associated_records_proxy.where(conditions).to_a