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

arel will deal with casting the ids, so we can delete this

Browse Source
This commit is contained in:
Aaron Patterson
2010-12-25 16:42:49 -07:00
parent 75ac9c4271
commit bde643fbec
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -349,19 +349,7 @@ module ActiveRecord
table = klass.arel_table
primary_key = (reflection.options[:primary_key] || klass.primary_key).to_s
column_type = klass.columns.detect{|c| c.name == primary_key}.type
ids = _id_map.keys.map do |id|
if column_type == :integer
id.to_i
elsif column_type == :float
id.to_f
else
id
end
end
method = in_or_equal(ids)
method = in_or_equal(_id_map.keys)
conditions = table[primary_key].send(*method)
custom_conditions = append_conditions(reflection, preload_options)