From b127d86c1823d60a29191ecc3c21c97ee3ac502c Mon Sep 17 00:00:00 2001 From: Ernie Miller Date: Fri, 17 Aug 2012 11:31:23 -0400 Subject: Fix merge error when Equality LHS is non-attribute This is at best a band-aid for a more proper fix, since it won't truly handle the removal of the previous equality condition of these other nodes. I'm planning to put in some work on ARel toward supporting that goal. Related: rails/arel#130, ernie/squeel#153, ernie/squeel#156 --- activerecord/test/cases/relations_test.rb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'activerecord/test/cases') diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 84027ea5ae..4ef11590a9 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -668,6 +668,22 @@ class RelationTest < ActiveRecord::TestCase assert_equal [developers(:poor_jamis)], dev_with_count.to_a end + def test_relation_merging_with_arel_equalities_keeps_last_equality + devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge( + Developer.where(Developer.arel_table[:salary].eq(9000)) + ) + assert_equal [developers(:poor_jamis)], devs.to_a + end + + def test_relation_merging_with_arel_equalities_with_a_non_attribute_left_hand_ignores_non_attributes_when_discarding_equalities + salary_attr = Developer.arel_table[:salary] + devs = Developer.where(salary_attr.eq(80000)).merge( + Developer.where(salary_attr.eq(9000)). + where(Arel::Nodes::NamedFunction.new('abs', [salary_attr]).eq(9000)) + ) + assert_equal [developers(:poor_jamis)], devs.to_a + end + def test_relation_merging_with_eager_load relations = [] relations << Post.order('comments.id DESC').merge(Post.eager_load(:last_comment)).merge(Post.all) -- cgit v1.2.3