diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-22 18:30:18 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-12-22 18:30:18 -0800 |
| commit | 35f5938c9128718a2c5515524c815def75a53f00 (patch) | |
| tree | f1ec0f58bdcd08f3fb9e4df2ff347131decdbbae /activerecord/lib/active_record | |
| parent | 3e64336647fefe598ff3b0775401e2c2c5d378d3 (diff) | |
| download | rails-35f5938c9128718a2c5515524c815def75a53f00.tar.gz rails-35f5938c9128718a2c5515524c815def75a53f00.tar.bz2 rails-35f5938c9128718a2c5515524c815def75a53f00.zip | |
probably should use the some_ids variable here. o_O
Diffstat (limited to 'activerecord/lib/active_record')
| -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 fc7c544a55..7f5c5dd2ad 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -216,7 +216,7 @@ module ActiveRecord order(options[:order]) all_associated_records = associated_records(ids) do |some_ids| - associated_records_proxy.where([conditions, ids]).to_a + associated_records_proxy.where([conditions, some_ids]).to_a end set_association_collection_records(id_to_record_map, reflection.name, all_associated_records, 'the_parent_record_id') |