From b289519f4ff7829271674d66d3196e1ee23056b6 Mon Sep 17 00:00:00 2001 From: 90yukke Date: Mon, 22 Jul 2013 23:08:02 +0300 Subject: Fix merge error when Equality LHS is non-attribute. This is reworking of rails/rails/pull/7380 made for rails 3. --- activerecord/lib/active_record/relation/spawn_methods.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/relation/spawn_methods.rb b/activerecord/lib/active_record/relation/spawn_methods.rb index 90f2ac3cde..b734fc5c51 100644 --- a/activerecord/lib/active_record/relation/spawn_methods.rb +++ b/activerecord/lib/active_record/relation/spawn_methods.rb @@ -32,11 +32,12 @@ module ActiveRecord merged_wheres = @where_values + r.where_values unless @where_values.empty? - # Remove duplicates, last one wins. + # Remove duplicate ARel attributes. Last one wins. seen = Hash.new { |h,table| h[table] = {} } merged_wheres = merged_wheres.reverse.reject { |w| nuke = false - if w.respond_to?(:operator) && w.operator == :== + 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] -- cgit v1.2.3