diff options
| author | Robert Pankowecki <robert.pankowecki@gmail.com> | 2010-07-27 22:57:27 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-02 16:41:20 +0200 |
| commit | f8b53f35b9cbf2a134a7d9184a044ce95764acfa (patch) | |
| tree | 33e6076c3d06295f3442f70ae141a2421dd6a00c /activerecord/lib | |
| parent | 558ee6e95ccd6c2098595f2edfa59e8aa9108167 (diff) | |
| download | rails-f8b53f35b9cbf2a134a7d9184a044ce95764acfa.tar.gz rails-f8b53f35b9cbf2a134a7d9184a044ce95764acfa.tar.bz2 rails-f8b53f35b9cbf2a134a7d9184a044ce95764acfa.zip | |
test and fix collection_singular_ids= with string primary keys [#5125 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 9663a36edf..bd90cfc5d5 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1439,7 +1439,9 @@ module ActiveRecord end redefine_method("#{reflection.name.to_s.singularize}_ids=") do |new_value| - ids = (new_value || []).reject { |nid| nid.blank? }.map(&:to_i) + pk_column = reflection.klass.columns.find{|c| c.name == reflection.klass.primary_key } + ids = (new_value || []).reject { |nid| nid.blank? } + ids.map!{|i| pk_column.type_cast(i)} send("#{reflection.name}=", reflection.klass.find(ids).index_by(&:id).values_at(*ids)) end end |