aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-07-17 17:35:16 +0900
committerGitHub <noreply@github.com>2019-07-17 17:35:16 +0900
commit2a28b7c292b3d6c0a01722f50beedb8ec1bf074c (patch)
tree19eac18ee91b8ac284163b79df74af5d25c7d22b /activerecord/lib
parent32e5f9049c3ef626c9ba7b643c06b09b1ca8f6c1 (diff)
parentb19150448bcf65362c34b5a741ce162cd2b79216 (diff)
downloadrails-2a28b7c292b3d6c0a01722f50beedb8ec1bf074c.tar.gz
rails-2a28b7c292b3d6c0a01722f50beedb8ec1bf074c.tar.bz2
rails-2a28b7c292b3d6c0a01722f50beedb8ec1bf074c.zip
Merge pull request #36696 from inopinatus/support_beginless_ranges
Support beginless ranges in hash conditions.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/arel/predications.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/arel/predications.rb b/activerecord/lib/arel/predications.rb
index dece478615..895d394363 100644
--- a/activerecord/lib/arel/predications.rb
+++ b/activerecord/lib/arel/predications.rb
@@ -37,7 +37,7 @@ module Arel # :nodoc: all
def between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
self.in([])
- elsif open_ended?(other.begin)
+ elsif other.begin.nil? || open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end)
not_in([])
elsif other.exclude_end?
@@ -85,7 +85,7 @@ Passing a range to `#in` is deprecated. Call `#between`, instead.
def not_between(other)
if unboundable?(other.begin) == 1 || unboundable?(other.end) == -1
not_in([])
- elsif open_ended?(other.begin)
+ elsif other.begin.nil? || open_ended?(other.begin)
if other.end.nil? || open_ended?(other.end)
self.in([])
elsif other.exclude_end?