diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-17 14:17:36 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-08-17 14:17:36 -0700 |
commit | 366eb7216edd4515d4c5491df6868dbf9fecd261 (patch) | |
tree | 6861e0a6cda6b6f3a0d9859ba190514b86d785fa /activerecord/test/cases/relations_test.rb | |
parent | 271beddd8929758802e11826297adf92e40cd4af (diff) | |
parent | b127d86c1823d60a29191ecc3c21c97ee3ac502c (diff) | |
download | rails-366eb7216edd4515d4c5491df6868dbf9fecd261.tar.gz rails-366eb7216edd4515d4c5491df6868dbf9fecd261.tar.bz2 rails-366eb7216edd4515d4c5491df6868dbf9fecd261.zip |
Merge pull request #7380 from ernie/fix-nomethoderror-on-non-attribute-equalities
Fix merge error when Equality LHS is non-attribute
Diffstat (limited to 'activerecord/test/cases/relations_test.rb')
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 16 |
1 files changed, 16 insertions, 0 deletions
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) |