diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-22 14:38:39 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-09-22 14:38:39 -0300 |
| commit | 7f2e64520f001e3f589b0370cc75acf9ae386c4c (patch) | |
| tree | 749f06f2b3c53418dca43022bb355a937ae21fc8 /activerecord/lib/active_record | |
| parent | e504cd261d850f01e4064b31a1ed543b5746ffd2 (diff) | |
| parent | abf3fef1e68eb89173b76a8bb3afcdda3f05f0a3 (diff) | |
| download | rails-7f2e64520f001e3f589b0370cc75acf9ae386c4c.tar.gz rails-7f2e64520f001e3f589b0370cc75acf9ae386c4c.tar.bz2 rails-7f2e64520f001e3f589b0370cc75acf9ae386c4c.zip | |
Merge pull request #10500 from kennyj/fix_10450
Fixed a bug in when using has_many association with :inverse_of option and UUID primary key.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index e32c0b0377..98d573a3a2 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -554,14 +554,14 @@ module ActiveRecord # specified, then #find scans the entire collection. def find_by_scan(*args) expects_array = args.first.kind_of?(Array) - ids = args.flatten.compact.map{ |arg| arg.to_i }.uniq + ids = args.flatten.compact.map{ |arg| arg.to_s }.uniq if ids.size == 1 id = ids.first - record = load_target.detect { |r| id == r.id } + record = load_target.detect { |r| id == r.id.to_s } expects_array ? [ record ] : record else - load_target.select { |r| ids.include?(r.id) } + load_target.select { |r| ids.include?(r.id.to_s) } end end |