diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2014-11-17 15:04:40 -0800 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2014-11-17 15:04:40 -0800 |
| commit | eb26f24bde62cbbcd8ef0e7ee9c64060b098baff (patch) | |
| tree | bd9a245d1bc6a6a480363c9254cdcd3508ee6ca4 /activerecord/lib/active_record/relation/merger.rb | |
| parent | c01b20b658c9fe4b7d54f4a227a09cb090b5763d (diff) | |
| download | rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.tar.gz rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.tar.bz2 rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.zip | |
Remove the unused second argument to `substitute_at`
Oh hey, we got to remove some code because of that!
Diffstat (limited to 'activerecord/lib/active_record/relation/merger.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index a8febf6a18..a27f990f74 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -118,18 +118,6 @@ module ActiveRecord where_values = kept + rhs_wheres bind_values = filter_binds(lhs_binds, removed) + rhs_binds - conn = relation.klass.connection - bv_index = 0 - where_values.map! do |node| - if Arel::Nodes::Equality === node && Arel::Nodes::BindParam === node.right - substitute = conn.substitute_at(bind_values[bv_index].first, bv_index) - bv_index += 1 - Arel::Nodes::Equality.new(node.left, substitute) - else - node - end - end - relation.where_values = where_values relation.bind_values = bind_values |