diff options
| author | Sean Griffin <sean@thoughtbot.com> | 2015-01-28 14:04:26 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@thoughtbot.com> | 2015-01-28 14:35:03 -0700 |
| commit | ff45b9e9f7c4ff0fb4fdab8beb539913b876d63b (patch) | |
| tree | 1513baae2abecb8e0ce14fe21ae8563c876d25ab /activerecord/lib/active_record/null_relation.rb | |
| parent | b0b37942d729b6bdcd2e3178eda7fa1de203b3d0 (diff) | |
| download | rails-ff45b9e9f7c4ff0fb4fdab8beb539913b876d63b.tar.gz rails-ff45b9e9f7c4ff0fb4fdab8beb539913b876d63b.tar.bz2 rails-ff45b9e9f7c4ff0fb4fdab8beb539913b876d63b.zip | |
Bring the implementation of Relation#or up to speed
Diffstat (limited to 'activerecord/lib/active_record/null_relation.rb')
| -rw-r--r-- | activerecord/lib/active_record/null_relation.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/null_relation.rb b/activerecord/lib/active_record/null_relation.rb index 802adca908..63ca29305d 100644 --- a/activerecord/lib/active_record/null_relation.rb +++ b/activerecord/lib/active_record/null_relation.rb @@ -77,11 +77,7 @@ module ActiveRecord end def or(other) - if other.is_a?(NullRelation) - super - else - other.or(self) - end + other.spawn end end end |