diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-01-22 08:28:45 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2014-01-22 08:28:45 -0800 |
| commit | 0d24946903853e09fce1824d28d3ad7b210b71b5 (patch) | |
| tree | 61f55f78aa59a595c7b0eec818bd291d38484dab /activerecord/lib/active_record | |
| parent | 8f17a834ae98cea28ceff22bf11ce346b867bc90 (diff) | |
| parent | ce91efed652bbcec42dbc68e421f717fb2ecc9b8 (diff) | |
| download | rails-0d24946903853e09fce1824d28d3ad7b210b71b5.tar.gz rails-0d24946903853e09fce1824d28d3ad7b210b71b5.tar.bz2 rails-0d24946903853e09fce1824d28d3ad7b210b71b5.zip | |
Merge pull request #13791 from kei-s/remove_duplicate_merge
Remove duplicate merge
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/relation.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb index 17af887abc..fb213dc6f7 100644 --- a/activerecord/lib/active_record/relation.rb +++ b/activerecord/lib/active_record/relation.rb @@ -535,7 +535,6 @@ module ActiveRecord } binds = Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }] - binds.merge!(Hash[bind_values.find_all(&:first).map { |column, v| [column.name, v] }]) Hash[equalities.map { |where| name = where.left.name |