From 5afed6d45def1e72df24679a746cbe96b52c1709 Mon Sep 17 00:00:00 2001 From: Ernie Miller Date: Sat, 24 Apr 2010 08:02:47 -0400 Subject: Inequality shouldn't descend from equality, due to Rails type checks, and resolve conflicts from rebase --- lib/arel/engines/memory/predicates.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/arel/engines/memory') diff --git a/lib/arel/engines/memory/predicates.rb b/lib/arel/engines/memory/predicates.rb index 0e88810e7d..8b3e5843cc 100644 --- a/lib/arel/engines/memory/predicates.rb +++ b/lib/arel/engines/memory/predicates.rb @@ -52,7 +52,7 @@ module Arel def operator; :== end end - class Inequality < Equality + class Inequality < Binary def eval(row) operand1.eval(row) != operand2.eval(row) end -- cgit v1.2.3