Merge branch 'master' into guides_session_guidelines_2

1 files changed, 39 insertions, 10 deletions

diff --git a/activerecord/test/cases/arel/visitors/mysql_test.rb b/activerecord/test/cases/arel/visitors/mysql_test.rb
index 9d3bad8516..5f37587957 100644
--- a/activerecord/test/cases/arel/visitors/mysql_test.rb
+++ b/activerecord/test/cases/arel/visitors/mysql_test.rb
@@ -13,16 +13,6 @@ module Arel
         @visitor.accept(node, Collectors::SQLString.new).value
       end
 
-      it "squashes parenthesis on multiple unions" do
-        subnode = Nodes::Union.new Arel.sql("left"), Arel.sql("right")
-        node    = Nodes::Union.new subnode, Arel.sql("topright")
-        assert_equal 1, compile(node).scan("(").length
-
-        subnode = Nodes::Union.new Arel.sql("left"), Arel.sql("right")
-        node    = Nodes::Union.new Arel.sql("topleft"), subnode
-        assert_equal 1, compile(node).scan("(").length
-      end
-
       ###
       # :'(
       # http://dev.mysql.com/doc/refman/5.0/en/select.html#id3482214
@@ -75,6 +65,45 @@ module Arel
           }
         end
       end
+
+      describe "Nodes::IsNotDistinctFrom" do
+        it "should construct a valid generic SQL statement" do
+          test = Table.new(:users)[:name].is_not_distinct_from "Aaron Patterson"
+          compile(test).must_be_like %{
+            "users"."name" <=> 'Aaron Patterson'
+          }
+        end
+
+        it "should handle column names on both sides" do
+          test = Table.new(:users)[:first_name].is_not_distinct_from Table.new(:users)[:last_name]
+          compile(test).must_be_like %{
+            "users"."first_name" <=> "users"."last_name"
+          }
+        end
+
+        it "should handle nil" do
+          @table = Table.new(:users)
+          val = Nodes.build_quoted(nil, @table[:active])
+          sql = compile Nodes::IsNotDistinctFrom.new(@table[:name], val)
+          sql.must_be_like %{ "users"."name" <=> NULL }
+        end
+      end
+
+      describe "Nodes::IsDistinctFrom" do
+        it "should handle column names on both sides" do
+          test = Table.new(:users)[:first_name].is_distinct_from Table.new(:users)[:last_name]
+          compile(test).must_be_like %{
+            NOT "users"."first_name" <=> "users"."last_name"
+          }
+        end
+
+        it "should handle nil" do
+          @table = Table.new(:users)
+          val = Nodes.build_quoted(nil, @table[:active])
+          sql = compile Nodes::IsDistinctFrom.new(@table[:name], val)
+          sql.must_be_like %{ NOT "users"."name" <=> NULL }
+        end
+      end
     end
   end
 end