1 files changed, 16 insertions, 43 deletions
diff --git a/activerecord/test/cases/quoting_test.rb b/activerecord/test/cases/quoting_test.rb
index 0819776fbf..6534770c57 100644
--- a/activerecord/test/cases/quoting_test.rb
+++ b/activerecord/test/cases/quoting_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "cases/helper"
 
 module ActiveRecord
@@ -8,11 +10,11 @@ module ActiveRecord
       end
 
       def test_quoted_true
-        assert_equal "'t'", @quoter.quoted_true
+        assert_equal "TRUE", @quoter.quoted_true
       end
 
       def test_quoted_false
-        assert_equal "'f'", @quoter.quoted_false
+        assert_equal "FALSE", @quoter.quoted_false
       end
 
       def test_quote_column_name
@@ -81,23 +83,6 @@ module ActiveRecord
         end
       end
 
-      class QuotedOne
-        def quoted_id
-          1
-        end
-      end
-      class SubQuotedOne < QuotedOne
-      end
-      def test_quote_with_quoted_id
-        assert_deprecated(/defined on \S+::QuotedOne at .*quoting_test\.rb:[0-9]/) do
-          assert_equal 1, @quoter.quote(QuotedOne.new)
-        end
-
-        assert_deprecated(/defined on \S+::SubQuotedOne\(\S+::QuotedOne\) at .*quoting_test\.rb:[0-9]/) do
-          assert_equal 1, @quoter.quote(SubQuotedOne.new)
-        end
-      end
-
       def test_quote_nil
         assert_equal "NULL", @quoter.quote(nil)
       end
@@ -126,7 +111,7 @@ module ActiveRecord
       end
 
       def test_quote_bigdecimal
-        bigdec = BigDecimal.new((1 << 100).to_s)
+        bigdec = BigDecimal((1 << 100).to_s)
         assert_equal bigdec.to_s("F"), @quoter.quote(bigdec)
       end
 
@@ -174,13 +159,21 @@ module ActiveRecord
 
       def test_type_cast_date
         date = Date.today
-        expected = @conn.quoted_date(date)
+        if current_adapter?(:Mysql2Adapter)
+          expected = date
+        else
+          expected = @conn.quoted_date(date)
+        end
         assert_equal expected, @conn.type_cast(date)
       end
 
       def test_type_cast_time
         time = Time.now
-        expected = @conn.quoted_date(time)
+        if current_adapter?(:Mysql2Adapter)
+          expected = time
+        else
+          expected = @conn.quoted_date(time)
+        end
         assert_equal expected, @conn.type_cast(time)
       end
 
@@ -197,26 +190,6 @@ module ActiveRecord
         obj = Class.new.new
         assert_raise(TypeError) { @conn.type_cast(obj) }
       end
-
-      def test_type_cast_object_which_responds_to_quoted_id
-        quoted_id_obj = Class.new {
-          def quoted_id
-            "'zomg'"
-          end
-
-          def id
-            10
-          end
-        }.new
-        assert_equal 10, @conn.type_cast(quoted_id_obj)
-
-        quoted_id_obj = Class.new {
-          def quoted_id
-            "'zomg'"
-          end
-        }.new
-        assert_raise(TypeError) { @conn.type_cast(quoted_id_obj) }
-      end
     end
 
     class QuoteBooleanTest < ActiveRecord::TestCase
@@ -257,7 +230,7 @@ module ActiveRecord
 
         def test_type_cast_ar_object
           value = DatetimePrimaryKey.new(id: @time)
-          assert_equal "2017-02-14 12:34:56.789000",  @connection.type_cast(value)
+          assert_equal @connection.type_cast(value.id),  @connection.type_cast(value)
         end
       end
     end