kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Move nil? check to open_ended? method

Browse source
This commit is contained in:
Stuart 2020-01-06 17:17:17 -05:00
parent 667b150c20
commit b16360cfb6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activerecord/lib/arel/predications.rb
View file

@ -37,15 +37,15 @@ module Arel # :nodoc: all
def between(other) def between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1 if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
self.in([]) self.in([])
elsif other.begin.nil? || open_ended?(other.begin) elsif open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end) if open_ended?(other.end)
not_in([]) not_in([])
elsif other.exclude_end? elsif other.exclude_end?
lt(other.end) lt(other.end)
else else
lteq(other.end) lteq(other.end)
end end
elsif other.end.nil? || open_ended?(other.end) elsif open_ended?(other.end)
gteq(other.begin) gteq(other.begin)
elsif other.exclude_end? elsif other.exclude_end?
gteq(other.begin).and(lt(other.end)) gteq(other.begin).and(lt(other.end))
@ -85,15 +85,15 @@ Passing a range to `#in` is deprecated. Call `#between`, instead.
def not_between(other) def not_between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1 if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
not_in([]) not_in([])
elsif other.begin.nil? || open_ended?(other.begin) elsif open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end) if open_ended?(other.end)
self.in([]) self.in([])
elsif other.exclude_end? elsif other.exclude_end?
gteq(other.end) gteq(other.end)
else else
gt(other.end) gt(other.end)
end end
elsif other.end.nil? || open_ended?(other.end) elsif open_ended?(other.end)
lt(other.begin) lt(other.begin)
else else
left = lt(other.begin) left = lt(other.begin)
@ -250,7 +250,7 @@ Passing a range to `#not_in` is deprecated. Call `#not_between`, instead.
end end
def open_ended?(value) def open_ended?(value)
infinity?(value) || unboundable?(value) value.nil? || infinity?(value) || unboundable?(value)
end end
end end
end end