diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2016-06-11 07:45:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 07:45:53 -0700 |
| commit | f45d06e11fdacf45df55b7b6f20b4987fe367109 (patch) | |
| tree | 7301d82bf016fbdd1c08122a987bd7f1e84b4f0c /activerecord | |
| parent | 1528c8c2aea0dec2199a4eec8f54ab2c2d58e57c (diff) | |
| parent | 97c01bc776b83a05beed818dbcb77fbee6920568 (diff) | |
| download | rails-f45d06e11fdacf45df55b7b6f20b4987fe367109.tar.gz rails-f45d06e11fdacf45df55b7b6f20b4987fe367109.tar.bz2 rails-f45d06e11fdacf45df55b7b6f20b4987fe367109.zip | |
Merge pull request #25363 from kamipo/fix_or_result_sql
Fix `or` result SQL [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/relation/query_methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 2a831c2017..8a87015e44 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -658,7 +658,7 @@ module ActiveRecord # present). Neither relation may have a #limit, #offset, or #distinct set. # # Post.where("id = 1").or(Post.where("author_id = 3")) - # # SELECT `posts`.* FROM `posts` WHERE (('id = 1' OR 'author_id = 3')) + # # SELECT `posts`.* FROM `posts` WHERE ((id = 1) OR (author_id = 3)) # def or(other) unless other.is_a? Relation |