diff options
Diffstat (limited to 'activerecord/lib/active_record/relation')
| -rw-r--r-- | activerecord/lib/active_record/relation/merger.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb index 7531f22494..e5b50673da 100644 --- a/activerecord/lib/active_record/relation/merger.rb +++ b/activerecord/lib/active_record/relation/merger.rb @@ -97,18 +97,13 @@ module ActiveRecord merged_wheres = relation.where_values + values[:where] unless relation.where_values.empty? - # Remove duplicate ARel attributes. Last one wins. - seen = Hash.new { |h,table| h[table] = {} } + # Remove equalities with duplicated left-hand. Last one wins. + seen = {} merged_wheres = merged_wheres.reverse.reject { |w| nuke = false - # We might have non-attributes on the left side of equality nodes, - # so we need to make sure they quack like an attribute. - if w.respond_to?(:operator) && w.operator == :== && - w.left.respond_to?(:relation) - name = w.left.name - table = w.left.relation.name - nuke = seen[table][name] - seen[table][name] = true + if w.respond_to?(:operator) && w.operator == :== + nuke = seen[w.left] + seen[w.left] = true end nuke }.reverse |