diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-06-23 11:42:46 +0800 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-01-28 13:35:55 -0700 |
| commit | b0b37942d729b6bdcd2e3178eda7fa1de203b3d0 (patch) | |
| tree | cbf5e9fe861b6093166213b322e3d5f6bf0c8156 /activerecord/lib/active_record/null_relation.rb | |
| parent | 56a3d5ec9183a9bcbf140d4102d45e3928f2617a (diff) | |
| download | rails-b0b37942d729b6bdcd2e3178eda7fa1de203b3d0.tar.gz rails-b0b37942d729b6bdcd2e3178eda7fa1de203b3d0.tar.bz2 rails-b0b37942d729b6bdcd2e3178eda7fa1de203b3d0.zip | |
Added #or to ActiveRecord::Relation
Post.where('id = 1').or(Post.where('id = 2'))
# => SELECT * FROM posts WHERE (id = 1) OR (id = 2)
[Matthew Draper & Gael Muller]
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index b406da14dc..802adca908 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -75,5 +75,13 @@ module ActiveRecord def exists?(_id = false) false end + + def or(other) + if other.is_a?(NullRelation) + super + else + other.or(self) + end + end end end |