diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-14 20:29:30 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-14 20:29:30 -0300 |
| commit | ec6bb3320991df57c00a30c61a03cb5b44942404 (patch) | |
| tree | 233b1231971a823734981e4416d2c2597e43431e /activerecord/lib | |
| parent | f2bff250a017b6da76b7587a164643db31ffbf9b (diff) | |
| parent | 1d316ac1fd68962782762b02694a1bf9fd4ef44e (diff) | |
| download | rails-ec6bb3320991df57c00a30c61a03cb5b44942404.tar.gz rails-ec6bb3320991df57c00a30c61a03cb5b44942404.tar.bz2 rails-ec6bb3320991df57c00a30c61a03cb5b44942404.zip | |
Merge pull request #15078 from nbudin/fix_merger_filter_binds_comparison_master
Make filter_binds filter out symbols that are equal to strings
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index fcb28a18f6..ac41d0aa80 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -156,7 +156,7 @@ module ActiveRecord def filter_binds(lhs_binds, removed_wheres) return lhs_binds if removed_wheres.empty? - set = Set.new removed_wheres.map { |x| x.left.name } + set = Set.new removed_wheres.map { |x| x.left.name.to_s } lhs_binds.dup.delete_if { |col,_| set.include? col.name } end |