Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update open_ended? to support new Ruby 2.6 endless and Ruby 2.7 beginless ranges #38170

Merged
merged 1 commit into from Jan 7, 2020
Merged

Update open_ended? to support new Ruby 2.6 endless and Ruby 2.7 beginless ranges #38170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions activerecord/lib/arel/predications.rb
View file
Open in desktop
Expand Up @@ -37,15 +37,15 @@ def eq_all(others)
def between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
self.in([])
elsif other.begin.nil? || open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end)
elsif open_ended?(other.begin)
if open_ended?(other.end)
not_in([])
elsif other.exclude_end?
lt(other.end)
else
lteq(other.end)
end
elsif other.end.nil? || open_ended?(other.end)
elsif open_ended?(other.end)
gteq(other.begin)
elsif other.exclude_end?
gteq(other.begin).and(lt(other.end))
Expand Down Expand Up @@ -85,15 +85,15 @@ def in_all(others)
def not_between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
not_in([])
elsif other.begin.nil? || open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end)
elsif open_ended?(other.begin)
if open_ended?(other.end)
self.in([])
elsif other.exclude_end?
gteq(other.end)
else
gt(other.end)
end
elsif other.end.nil? || open_ended?(other.end)
elsif open_ended?(other.end)
lt(other.begin)
else
left = lt(other.begin)
Expand Down Expand Up @@ -250,7 +250,7 @@ def unboundable?(value)
end

def open_ended?(value)
infinity?(value) || unboundable?(value)
value.nil? || infinity?(value) || unboundable?(value)
end
end
end