diff options
author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-02-17 11:47:37 +0530 |
---|---|---|
committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-02-17 11:50:29 +0530 |
commit | e254665ac0eea72bdc3997c5fda9d02300ed0717 (patch) | |
tree | 74dd3bed8124f4ab8afa25c0db5db038188c1574 /activerecord/test | |
parent | bb4a85da1011fecf4da6fe5b7ed73d3ba9e2e7f3 (diff) | |
download | rails-e254665ac0eea72bdc3997c5fda9d02300ed0717.tar.gz rails-e254665ac0eea72bdc3997c5fda9d02300ed0717.tar.bz2 rails-e254665ac0eea72bdc3997c5fda9d02300ed0717.zip |
Show proper error message when a non-relation object is passed to AR::Relation#or
- Previously it used to show error message
<"undefined method `limit_value' for {:title=>\"Rails\"}:Hash">
- Now it shows following error message.
>> Post.where.not(name: 'DHH').or(name: 'Tenderlove')
ArgumentError: You have passed Hash object to #or. Pass an ActiveRecord::Relation object instead.
- Fixes #23714.
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/relation/or_test.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation/or_test.rb b/activerecord/test/cases/relation/or_test.rb index 28a0862f91..ce8c5ca489 100644 --- a/activerecord/test/cases/relation/or_test.rb +++ b/activerecord/test/cases/relation/or_test.rb @@ -82,5 +82,11 @@ module ActiveRecord assert_equal p.loaded?, true assert_equal expected, p.or(Post.where('id = 2')).to_a end + + def test_or_with_non_relation_object_raises_error + assert_raises ArgumentError do + Post.where(id: [1, 2, 3]).or(title: 'Rails') + end + end end end |