eliminate some conditionals

rails · May 21, 2013 · bff89a2 · bff89a2
1 parent 52ed881
commit bff89a2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
@@ -145,10 +145,10 @@ def merged_wheres
       # Remove equalities from the existing relation with a LHS which is
       # present in the relation being merged in.
       def reject_overwrites(lhs_wheres, rhs_wheres)
-        seen = Set.new
+        nodes = rhs_wheres.find_all do |w|
-        rhs_wheres.each do |w|
+          w.respond_to?(:operator) && w.operator == :==
-          seen << w.left if w.respond_to?(:operator) && w.operator == :==
         end
+        seen = Set.new(nodes) { |node| node.left }
 
         lhs_wheres.reject do |w|
           w.respond_to?(:operator) && w.operator == :== && seen.include?(w.left)