Inequality shouldn't descend from equality, due to Rails type checks, and resolve conflicts from rebase

6 files changed, 9 insertions, 15 deletions

diff --git a/lib/arel/algebra/predicates.rb b/lib/arel/algebra/predicates.rb
index 5e17cdd101..d789c1d8a2 100644
--- a/lib/arel/algebra/predicates.rb
+++ b/lib/arel/algebra/predicates.rb
@@ -145,7 +145,13 @@ module Arel
       end
     end
 
-    class Inequality  < Equality
+    class Inequality  < Binary
+      def ==(other)
+        Equality === other and
+          ((operand1 == other.operand1 and operand2 == other.operand2) or
+           (operand1 == other.operand2 and operand2 == other.operand1))
+      end
+      
       def complement
         Equality.new(operand1, operand2)
       end
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
diff --git a/lib/arel/engines/sql/core_extensions/nil_class.rb b/lib/arel/engines/sql/core_extensions/nil_class.rb
index d4bb0e4c33..ab990d6211 100644
--- a/lib/arel/engines/sql/core_extensions/nil_class.rb
+++ b/lib/arel/engines/sql/core_extensions/nil_class.rb
@@ -9,10 +9,6 @@ module Arel
         'IS NOT'
       end
 
-      def not_predicate_sql
-        'IS NOT'
-      end
-
       NilClass.send(:include, self)
     end
   end
diff --git a/lib/arel/engines/sql/core_extensions/object.rb b/lib/arel/engines/sql/core_extensions/object.rb
index 5415c84706..01c3c5479d 100644
--- a/lib/arel/engines/sql/core_extensions/object.rb
+++ b/lib/arel/engines/sql/core_extensions/object.rb
@@ -13,10 +13,6 @@ module Arel
         '!='
       end
 
-      def not_predicate_sql
-        '!='
-      end
-
       Object.send(:include, self)
     end
   end
diff --git a/lib/arel/engines/sql/predicates.rb b/lib/arel/engines/sql/predicates.rb
index df8700a500..59b0ab0929 100644
--- a/lib/arel/engines/sql/predicates.rb
+++ b/lib/arel/engines/sql/predicates.rb
@@ -52,7 +52,7 @@ module Arel
       end
     end
 
-    class Inequality < Equality
+    class Inequality < Binary
       def predicate_sql
         operand2.inequality_predicate_sql
       end
diff --git a/lib/arel/engines/sql/primitives.rb b/lib/arel/engines/sql/primitives.rb
index 41769fa510..15a27b2256 100644
--- a/lib/arel/engines/sql/primitives.rb
+++ b/lib/arel/engines/sql/primitives.rb
@@ -42,10 +42,6 @@ module Arel
       value.inequality_predicate_sql
     end
 
-    def not_predicate_sql
-      value.not_predicate_sql
-    end
-
     def to_sql(formatter = Sql::WhereCondition.new(relation))
       formatter.value value
     end