Skip to content

Commit 0856f7c

Browse files
committed
There is no need to check null_relation? in empty_scope?
`values[:extending]` includes `NullRelation` if `null_relation?`.
1 parent 56b4fdb commit 0856f7c

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

activerecord/lib/active_record/relation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ def inspect
689689
end
690690

691691
def empty_scope? # :nodoc:
692-
!null_relation? && @values == klass.unscoped.values
692+
@values == klass.unscoped.values
693693
end
694694

695695
def has_limit_or_offset? # :nodoc:

activerecord/test/cases/relation_test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ def test_empty_scope
101101

102102
relation.merge!(relation)
103103
assert_predicate relation, :empty_scope?
104+
105+
assert_not_predicate NullPost.all, :empty_scope?
106+
assert_not_predicate FirstPost.all, :empty_scope?
104107
end
105108

106109
def test_bad_constants_raise_errors

activerecord/test/models/post.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,10 @@ class SubStiPost < StiPost
203203

204204
class SubAbstractStiPost < AbstractStiPost; end
205205

206+
class NullPost < Post
207+
default_scope { none }
208+
end
209+
206210
class FirstPost < ActiveRecord::Base
207211
self.inheritance_column = :disabled
208212
self.table_name = "posts"

0 commit comments

Comments
 (0)