From 0afcfa27c9f386ca7c190cd1f66db1cdd9971f3b Mon Sep 17 00:00:00 2001 From: Ernie Miller Date: Tue, 30 Mar 2010 09:52:22 -0400 Subject: Rename Attribute Not -> Inequality and add a Not predicate (complement) --- lib/arel/algebra/attributes/attribute.rb | 2 +- lib/arel/algebra/predicates.rb | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'lib/arel/algebra') diff --git a/lib/arel/algebra/attributes/attribute.rb b/lib/arel/algebra/attributes/attribute.rb index 5689d69b02..0266b38db3 100644 --- a/lib/arel/algebra/attributes/attribute.rb +++ b/lib/arel/algebra/attributes/attribute.rb @@ -84,7 +84,7 @@ module Arel module Predications methods = { :eq => "Equality", - :not => "Not", + :noteq => "Inequality", :lt => "LessThan", :lteq => "LessThanOrEqualTo", :gt => "GreaterThan", diff --git a/lib/arel/algebra/predicates.rb b/lib/arel/algebra/predicates.rb index ea1f771abb..43606139b0 100644 --- a/lib/arel/algebra/predicates.rb +++ b/lib/arel/algebra/predicates.rb @@ -8,6 +8,10 @@ module Arel def and(other_predicate) And.new(self, other_predicate) end + + def not + Not.new(self) + end end class Grouped < Predicate @@ -35,6 +39,11 @@ module Arel a2.inject({}) { |h,e| h[e] = a2.select { |i| i == e }.size; h } end end + + class Unary < Predicate + attributes :operand + deriving :initialize, :== + end class Binary < Predicate attributes :operand1, :operand2 @@ -59,7 +68,7 @@ module Arel end end - class Not < Equality; end + class Inequality < Equality; end class GreaterThanOrEqualTo < Binary; end class GreaterThan < Binary; end class LessThanOrEqualTo < Binary; end -- cgit v1.2.3