diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
commit | eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3 (patch) | |
tree | 3b193dba9756b45e1a0a70d47faa4c3e2ff946a9 /activerecord/lib/active_record/association_preload.rb | |
parent | 1304b664924bfea54fd6dc0dc924ae3d126ff92d (diff) | |
parent | 4f984c9d0e66601a81cb5ae6e3b50582e6dc0c2d (diff) | |
download | rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.gz rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.bz2 rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.zip |
Merge branch 'master' into testing
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 6e194ab9b4..69300e5ce5 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -312,7 +312,7 @@ module ActiveRecord table_name = klass.quoted_table_name primary_key = klass.primary_key column_type = klass.columns.detect{|c| c.name == primary_key}.type - ids = id_map.keys.uniq.map do |id| + ids = id_map.keys.map do |id| if column_type == :integer id.to_i elsif column_type == :float |