Remove all cases of manuallly wrapping `Arel::Nodes::Quoted`

This is no longer required now that we are injecting a type caster
object into the Arel table, with the exception of uniqueness
validations. Since it calls `ConnectionAdapter#type_cast`, the value has
already been cast for the database. We don't want Arel to attempt to
cast it further, so we need to continue wrapping it in a quoted node.
This can potentially go away when this validator is refactored to make
better use of `where` or the predicate builder.

3 files changed, 10 insertions, 12 deletions

diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb
index aa56df62fd..eb76ef6328 100644
--- a/activerecord/test/cases/relation/merging_test.rb
+++ b/activerecord/test/cases/relation/merging_test.rb
@@ -25,8 +25,8 @@ class RelationMergingTest < ActiveRecord::TestCase
   end
 
   def test_relation_merging_with_arel_equalities_keeps_last_equality
-    devs = Developer.where(Developer.arel_table[:salary].eq(Arel::Nodes::Quoted.new(80000))).merge(
-      Developer.where(Developer.arel_table[:salary].eq(Arel::Nodes::Quoted.new(9000)))
+    devs = Developer.where(Developer.arel_table[:salary].eq(80000)).merge(
+      Developer.where(Developer.arel_table[:salary].eq(9000))
     )
     assert_equal [developers(:poor_jamis)], devs.to_a
   end
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb
index 0819b6b11a..f7cb471984 100644
--- a/activerecord/test/cases/relation_test.rb
+++ b/activerecord/test/cases/relation_test.rb
@@ -64,21 +64,21 @@ module ActiveRecord
 
     def test_has_values
       relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
-      relation.where! relation.table[:id].eq(Arel::Nodes::Quoted.new(10))
+      relation.where! relation.table[:id].eq(10)
       assert_equal({:id => 10}, relation.where_values_hash)
     end
 
     def test_values_wrong_table
       relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
-      relation.where! Comment.arel_table[:id].eq(Arel::Nodes::Quoted.new(10))
+      relation.where! Comment.arel_table[:id].eq(10)
       assert_equal({}, relation.where_values_hash)
     end
 
     def test_tree_is_not_traversed
       relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
       # FIXME: Remove the Arel::Nodes::Quoted in Rails 5.1
-      left     = relation.table[:id].eq(Arel::Nodes::Quoted.new(10))
-      right    = relation.table[:id].eq(Arel::Nodes::Quoted.new(10))
+      left     = relation.table[:id].eq(10)
+      right    = relation.table[:id].eq(10)
       combine  = left.and right
       relation.where! combine
       assert_equal({}, relation.where_values_hash)
@@ -104,7 +104,7 @@ module ActiveRecord
     def test_create_with_value_with_wheres
       relation = Relation.new(Post, Post.arel_table, Post.predicate_builder)
       # FIXME: Remove the Arel::Nodes::Quoted in Rails 5.1
-      relation.where! relation.table[:id].eq(Arel::Nodes::Quoted.new(10))
+      relation.where! relation.table[:id].eq(10)
       relation.create_with_value = {:hello => 'world'}
       assert_equal({:hello => 'world', :id => 10}, relation.scope_for_create)
     end
@@ -115,7 +115,7 @@ module ActiveRecord
       assert_equal({}, relation.scope_for_create)
 
       # FIXME: Remove the Arel::Nodes::Quoted in Rails 5.1
-      relation.where! relation.table[:id].eq(Arel::Nodes::Quoted.new(10))
+      relation.where! relation.table[:id].eq(10)
       assert_equal({}, relation.scope_for_create)
 
       relation.create_with_value = {:hello => 'world'}
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
index d56f998622..0738df1b54 100644
--- a/activerecord/test/cases/scoping/default_scoping_test.rb
+++ b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -145,13 +145,11 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal expected_5, received_5
 
     expected_6 = Developer.order('salary DESC').collect(&:name)
-    # FIXME: Remove the Arel::Nodes::Quoted in Rails 5.1
-    received_6 = DeveloperOrderedBySalary.where(Developer.arel_table['name'].eq(Arel::Nodes::Quoted.new('David'))).unscope(where: :name).collect(&:name)
+    received_6 = DeveloperOrderedBySalary.where(Developer.arel_table['name'].eq('David')).unscope(where: :name).collect(&:name)
     assert_equal expected_6, received_6
 
     expected_7 = Developer.order('salary DESC').collect(&:name)
-    # FIXME: Remove the Arel::Nodes::Quoted in Rails 5.1
-    received_7 = DeveloperOrderedBySalary.where(Developer.arel_table[:name].eq(Arel::Nodes::Quoted.new('David'))).unscope(where: :name).collect(&:name)
+    received_7 = DeveloperOrderedBySalary.where(Developer.arel_table[:name].eq('David')).unscope(where: :name).collect(&:name)
     assert_equal expected_7, received_7
   end