From f7c5a8ce262cf16ad8d7c0b0d631a4b88afec414 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Mon, 9 Jul 2018 04:27:35 +0900
Subject: Subsecond precision is not supported until MySQL 5.6.4

---
 activerecord/test/cases/defaults_test.rb           | 26 +++++++++++-----------
 activerecord/test/schema/mysql2_specific_schema.rb | 12 +++++-----
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'activerecord/test')

diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index f34501b204..0f957d41cf 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -106,7 +106,7 @@ if current_adapter?(:Mysql2Adapter)
   class MysqlDefaultExpressionTest < ActiveRecord::TestCase
     include SchemaDumpingHelper
 
-    if ActiveRecord::Base.connection.version >= "5.6.0"
+    if subsecond_precision_supported?
       test "schema dump datetime includes default expression" do
         output = dump_table_schema("datetime_defaults")
         assert_match %r/t\.datetime\s+"modified_datetime",\s+default: -> { "CURRENT_TIMESTAMP(?:\(\))?" }/i, output
@@ -116,21 +116,21 @@ if current_adapter?(:Mysql2Adapter)
         output = dump_table_schema("datetime_defaults")
         assert_match %r/t\.datetime\s+"precise_datetime",.+default: -> { "CURRENT_TIMESTAMP\(6\)" }/i, output
       end
-    end
 
-    test "schema dump timestamp includes default expression" do
-      output = dump_table_schema("timestamp_defaults")
-      assert_match %r/t\.timestamp\s+"modified_timestamp",\s+default: -> { "CURRENT_TIMESTAMP(?:\(\))?" }/i, output
-    end
+      test "schema dump timestamp includes default expression" do
+        output = dump_table_schema("timestamp_defaults")
+        assert_match %r/t\.timestamp\s+"modified_timestamp",\s+default: -> { "CURRENT_TIMESTAMP(?:\(\))?" }/i, output
+      end
 
-    test "schema dump timestamp includes precise default expression" do
-      output = dump_table_schema("timestamp_defaults")
-      assert_match %r/t\.timestamp\s+"precise_timestamp",.+default: -> { "CURRENT_TIMESTAMP\(6\)" }/i, output
-    end
+      test "schema dump timestamp includes precise default expression" do
+        output = dump_table_schema("timestamp_defaults")
+        assert_match %r/t\.timestamp\s+"precise_timestamp",.+default: -> { "CURRENT_TIMESTAMP\(6\)" }/i, output
+      end
 
-    test "schema dump timestamp without default expression" do
-      output = dump_table_schema("timestamp_defaults")
-      assert_match %r/t\.timestamp\s+"nullable_timestamp"$/, output
+      test "schema dump timestamp without default expression" do
+        output = dump_table_schema("timestamp_defaults")
+        assert_match %r/t\.timestamp\s+"nullable_timestamp"$/, output
+      end
     end
   end
 
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index 1ac3b60c92..5d9ffd104d 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -2,17 +2,17 @@
 
 ActiveRecord::Schema.define do
 
-  if ActiveRecord::Base.connection.version >= "5.6.0"
+  if subsecond_precision_supported?
     create_table :datetime_defaults, force: true do |t|
       t.datetime :modified_datetime, default: -> { "CURRENT_TIMESTAMP" }
       t.datetime :precise_datetime, precision: 6, default: -> { "CURRENT_TIMESTAMP(6)" }
     end
-  end
 
-  create_table :timestamp_defaults, force: true do |t|
-    t.timestamp :nullable_timestamp
-    t.timestamp :modified_timestamp, default: -> { "CURRENT_TIMESTAMP" }
-    t.timestamp :precise_timestamp, precision: 6, default: -> { "CURRENT_TIMESTAMP(6)" }
+    create_table :timestamp_defaults, force: true do |t|
+      t.timestamp :nullable_timestamp
+      t.timestamp :modified_timestamp, default: -> { "CURRENT_TIMESTAMP" }
+      t.timestamp :precise_timestamp, precision: 6, default: -> { "CURRENT_TIMESTAMP(6)" }
+    end
   end
 
   create_table :binary_fields, force: true do |t|
-- 
cgit v1.2.3