aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-04 12:53:15 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-04 12:53:15 -0800
commitda8f6c7af7ea2305618f02378736c013f61646f1 (patch)
tree58be03c7c513a725fd862881c873ed19967d4f73 /lib
parent518d6b34e863d68b009674a45a1fe5105a38aee1 (diff)
parent0df9ab8442fc4a33b1962a49cebd66a3d1b0faf5 (diff)
downloadrails-da8f6c7af7ea2305618f02378736c013f61646f1.tar.gz
rails-da8f6c7af7ea2305618f02378736c013f61646f1.tar.bz2
rails-da8f6c7af7ea2305618f02378736c013f61646f1.zip
Merge pull request #164 from tpope/infinity-ranges
Support Float::INFINITY in ranges
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/predications.rb20
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/arel/predications.rb b/lib/arel/predications.rb
index e3f72d46a2..c485de07e3 100644
--- a/lib/arel/predications.rb
+++ b/lib/arel/predications.rb
@@ -29,7 +29,15 @@ module Arel
when Arel::SelectManager
Arel::Nodes::In.new(self, other.ast)
when Range
- if other.exclude_end?
+ if other.begin == -Float::INFINITY && other.end == Float::INFINITY
+ Nodes::NotIn.new self, []
+ elsif other.end == Float::INFINITY
+ Nodes::GreaterThanOrEqual.new(self, other.begin)
+ elsif other.begin == -Float::INFINITY && other.exclude_end?
+ Nodes::LessThan.new(self, other.end)
+ elsif other.begin == -Float::INFINITY
+ Nodes::LessThanOrEqual.new(self, other.end)
+ elsif other.exclude_end?
left = Nodes::GreaterThanOrEqual.new(self, other.begin)
right = Nodes::LessThan.new(self, other.end)
Nodes::And.new [left, right]
@@ -54,7 +62,15 @@ module Arel
when Arel::SelectManager
Arel::Nodes::NotIn.new(self, other.ast)
when Range
- if other.exclude_end?
+ if other.begin == -Float::INFINITY && other.end == Float::INFINITY
+ Nodes::In.new self, []
+ elsif other.end == Float::INFINITY
+ Nodes::LessThan.new(self, other.begin)
+ elsif other.begin == -Float::INFINITY && other.exclude_end?
+ Nodes::GreaterThanOrEqual.new(self, other.end)
+ elsif other.begin == -Float::INFINITY
+ Nodes::GreaterThan.new(self, other.end)
+ elsif other.exclude_end?
left = Nodes::LessThan.new(self, other.begin)
right = Nodes::GreaterThanOrEqual.new(self, other.end)
Nodes::Or.new left, right