diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-29 13:39:37 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-29 13:39:37 -0700 |
commit | c8f83d61a113ae3c01005d2ac02e4c17891d918c (patch) | |
tree | 1cdd7fef7be6274731dc89569df52a600c4841e0 /lib/arel/attributes/attribute.rb | |
parent | 5ec2fac114b1c70fe7ac87f4767b6f1cbc1e78fc (diff) | |
parent | 5ca0c9a45788a14b9f454c93cd24fb0ae12a896b (diff) | |
download | rails-c8f83d61a113ae3c01005d2ac02e4c17891d918c.tar.gz rails-c8f83d61a113ae3c01005d2ac02e4c17891d918c.tar.bz2 rails-c8f83d61a113ae3c01005d2ac02e4c17891d918c.zip |
Merge remote branch 'ernie/master'
* ernie/master:
Make PostgreSQL play nice with its friends. (matches -> ILIKE instead of LIKE)
Add support for remaining *_any/*_all attribute methods, and add matches/does_not_match/not_in
Add eq_any.
Diffstat (limited to 'lib/arel/attributes/attribute.rb')
-rw-r--r-- | lib/arel/attributes/attribute.rb | 133 |
1 files changed, 133 insertions, 0 deletions
diff --git a/lib/arel/attributes/attribute.rb b/lib/arel/attributes/attribute.rb index e1f7fd81d2..25ffe717b2 100644 --- a/lib/arel/attributes/attribute.rb +++ b/lib/arel/attributes/attribute.rb @@ -7,10 +7,26 @@ module Arel Nodes::NotEqual.new self, other end + def not_eq_any others + grouping_any :not_eq, others + end + + def not_eq_all others + grouping_all :not_eq, others + end + def eq other Nodes::Equality.new self, other end + def eq_any others + grouping_any :eq, others + end + + def eq_all others + grouping_all :eq, others + end + def in other case other when Arel::SelectManager @@ -28,13 +44,130 @@ module Arel end end + def in_any others + grouping_any :in, others + end + + def in_all others + grouping_all :in, others + end + + def not_in other + case other + when Arel::SelectManager + Nodes::NotIn.new self, other.to_a.map { |x| x.id } + when Range + if other.exclude_end? + left = Nodes::LessThan.new(self, other.min) + right = Nodes::GreaterThanOrEqual.new(self, other.max) + Nodes::Or.new left, right + else + left = Nodes::LessThan.new(self, other.min) + right = Nodes::GreaterThan.new(self, other.max) + Nodes::Or.new left, right + end + else + Nodes::NotIn.new self, other + end + end + + def not_in_any others + grouping_any :not_in, others + end + + def not_in_all others + grouping_all :not_in, others + end + + def matches other + Nodes::Matches.new self, other + end + + def matches_any others + grouping_any :matches, others + end + + def matches_all others + grouping_all :matches, others + end + + def does_not_match other + Nodes::DoesNotMatch.new self, other + end + + def does_not_match_any others + grouping_any :does_not_match, others + end + + def does_not_match_all others + grouping_all :does_not_match, others + end + def gteq right Nodes::GreaterThanOrEqual.new self, right end + def gteq_any others + grouping_any :gteq, others + end + + def gteq_all others + grouping_all :gteq, others + end + def gt right Nodes::GreaterThan.new self, right end + + def gt_any others + grouping_any :gt, others + end + + def gt_all others + grouping_all :gt, others + end + + def lt right + Nodes::LessThan.new self, right + end + + def lt_any others + grouping_any :lt, others + end + + def lt_all others + grouping_all :lt, others + end + + def lteq right + Nodes::LessThanOrEqual.new self, right + end + + def lteq_any others + grouping_any :lteq, others + end + + def lteq_all others + grouping_all :lteq, others + end + + private + + def grouping_any method_id, others + first = send method_id, others.shift + + Nodes::Grouping.new others.inject(first) { |memo,expr| + Nodes::Or.new(memo, send(method_id, expr)) + } + end + + def grouping_all method_id, others + first = send method_id, others.shift + + Nodes::Grouping.new others.inject(first) { |memo,expr| + Nodes::And.new(memo, send(method_id, expr)) + } + end end class String < Attribute; end |