diff options
author | Ernie Miller <ernie@metautonomo.us> | 2010-04-24 08:02:47 -0400 |
---|---|---|
committer | Ernie Miller <ernie@metautonomo.us> | 2010-05-07 13:08:31 -0400 |
commit | 5afed6d45def1e72df24679a746cbe96b52c1709 (patch) | |
tree | 50c8ab67f97c3aeba71046cb397f5e3f572c606b /lib/arel/engines/memory | |
parent | acdb9ea3036466b6553c85486f8fdfc5909f1275 (diff) | |
download | rails-5afed6d45def1e72df24679a746cbe96b52c1709.tar.gz rails-5afed6d45def1e72df24679a746cbe96b52c1709.tar.bz2 rails-5afed6d45def1e72df24679a746cbe96b52c1709.zip |
Inequality shouldn't descend from equality, due to Rails type checks, and resolve conflicts from rebase
Diffstat (limited to 'lib/arel/engines/memory')
-rw-r--r-- | lib/arel/engines/memory/predicates.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |