aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-12-09 14:52:11 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-12-09 14:52:11 -0800
commit6be1a71464f1e6833330b6cf9e239fd21b54c625 (patch)
treea5305d3fe7765902606a81136d2d2dc5e0691e2a /lib
parent11e29a32af658ee0956b1237fea1033698a457e8 (diff)
downloadrails-6be1a71464f1e6833330b6cf9e239fd21b54c625.tar.gz
rails-6be1a71464f1e6833330b6cf9e239fd21b54c625.tar.bz2
rails-6be1a71464f1e6833330b6cf9e239fd21b54c625.zip
stop using deprecated AND usage
Diffstat (limited to 'lib')
-rw-r--r--lib/arel/predications.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/arel/predications.rb b/lib/arel/predications.rb
index 23e68e99f1..58f02a2b53 100644
--- a/lib/arel/predications.rb
+++ b/lib/arel/predications.rb
@@ -36,9 +36,9 @@ module Arel
if other.exclude_end?
left = Nodes::GreaterThanOrEqual.new(self, other.begin)
right = Nodes::LessThan.new(self, other.end)
- Nodes::And.new left, right
+ Nodes::And.new [left, right]
else
- Nodes::Between.new(self, Nodes::And.new(other.begin, other.end))
+ Nodes::Between.new(self, Nodes::And.new([other.begin, other.end]))
end
else
Nodes::In.new self, other
@@ -174,7 +174,7 @@ module Arel
first = send method_id, others.shift
Nodes::Grouping.new others.inject(first) { |memo,expr|
- Nodes::And.new(memo, send(method_id, expr))
+ Nodes::And.new([memo, send(method_id, expr)])
}
end
end