1 files changed, 23 insertions, 19 deletions
diff --git a/activerecord/test/cases/adapters/mysql/quoting_test.rb b/activerecord/test/cases/adapters/mysql/quoting_test.rb
index d8a954efa8..2024aa36ab 100644
--- a/activerecord/test/cases/adapters/mysql/quoting_test.rb
+++ b/activerecord/test/cases/adapters/mysql/quoting_test.rb
@@ -1,25 +1,29 @@
 require "cases/helper"
 
-module ActiveRecord
-  module ConnectionAdapters
-    class MysqlAdapter
-      class QuotingTest < ActiveRecord::TestCase
-        def setup
-          @conn = ActiveRecord::Base.connection
-        end
+class MysqlQuotingTest < ActiveRecord::MysqlTestCase
+  def setup
+    @conn = ActiveRecord::Base.connection
+  end
+
+  def test_type_cast_true
+    assert_equal 1, @conn.type_cast(true)
+  end
 
-        def test_type_cast_true
-          c = Column.new(nil, 1, Type::Boolean.new)
-          assert_equal 1, @conn.type_cast(true, nil)
-          assert_equal 1, @conn.type_cast(true, c)
-        end
+  def test_type_cast_false
+    assert_equal 0, @conn.type_cast(false)
+  end
+
+  def test_quoted_date_precision_for_gte_564
+    @conn.stubs(:full_version).returns('5.6.4')
+    @conn.remove_instance_variable(:@version) if @conn.instance_variable_defined?(:@version)
+    t = Time.now.change(usec: 1)
+    assert_match(/\.000001\z/, @conn.quoted_date(t))
+  end
 
-        def test_type_cast_false
-          c = Column.new(nil, 1, Type::Boolean.new)
-          assert_equal 0, @conn.type_cast(false, nil)
-          assert_equal 0, @conn.type_cast(false, c)
-        end
-      end
-    end
+  def test_quoted_date_precision_for_lt_564
+    @conn.stubs(:full_version).returns('5.6.3')
+    @conn.remove_instance_variable(:@version) if @conn.instance_variable_defined?(:@version)
+    t = Time.now.change(usec: 1)
+    assert_no_match(/\.000001\z/, @conn.quoted_date(t))
   end
 end