aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorkei <kei.shiratsuchi@gmail.com>2014-01-22 22:13:38 +0900
committerkei <kei.shiratsuchi@gmail.com>2014-01-22 22:15:19 +0900
commitce91efed652bbcec42dbc68e421f717fb2ecc9b8 (patch)
tree722e9173f34a1ecd0c7fb6d2112dfe94902b9193 /activerecord/lib/active_record/relation.rb
parent75cd7bc3c2fe1dca24dd1b03d61e9ff173b3d65f (diff)
downloadrails-ce91efed652bbcec42dbc68e421f717fb2ecc9b8.tar.gz
rails-ce91efed652bbcec42dbc68e421f717fb2ecc9b8.tar.bz2
rails-ce91efed652bbcec42dbc68e421f717fb2ecc9b8.zip
Remove duplicate merge
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb1
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