Merge pull request #22381 from yahonda/use_adapter_subsecond_precision_supported

Use adapter supports_datetime_with_precision

4 files changed, 17 insertions, 60 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 72ca909b02..163cbb875f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -129,6 +129,10 @@ module ActiveRecord
         true
       end
 
+      def supports_datetime_with_precision?
+        true
+      end
+
       def active?
         @active != false
       end
diff --git a/activerecord/test/cases/date_time_precision_test.rb b/activerecord/test/cases/date_time_precision_test.rb
index 698f1b852e..e996d142a2 100644
--- a/activerecord/test/cases/date_time_precision_test.rb
+++ b/activerecord/test/cases/date_time_precision_test.rb
@@ -10,6 +10,7 @@ class DateTimePrecisionTest < ActiveRecord::TestCase
 
   setup do
     @connection = ActiveRecord::Base.connection
+    Foo.reset_column_information
   end
 
   teardown do
@@ -20,24 +21,24 @@ class DateTimePrecisionTest < ActiveRecord::TestCase
     @connection.create_table(:foos, force: true)
     @connection.add_column :foos, :created_at, :datetime, precision: 0
     @connection.add_column :foos, :updated_at, :datetime, precision: 5
-    assert_equal 0, activerecord_column_option('foos', 'created_at', 'precision')
-    assert_equal 5, activerecord_column_option('foos', 'updated_at', 'precision')
+    assert_equal 0, Foo.columns_hash['created_at'].precision
+    assert_equal 5, Foo.columns_hash['updated_at'].precision
   end
 
   def test_timestamps_helper_with_custom_precision
     @connection.create_table(:foos, force: true) do |t|
       t.timestamps precision: 4
     end
-    assert_equal 4, activerecord_column_option('foos', 'created_at', 'precision')
-    assert_equal 4, activerecord_column_option('foos', 'updated_at', 'precision')
+    assert_equal 4, Foo.columns_hash['created_at'].precision
+    assert_equal 4, Foo.columns_hash['updated_at'].precision
   end
 
   def test_passing_precision_to_datetime_does_not_set_limit
     @connection.create_table(:foos, force: true) do |t|
       t.timestamps precision: 4
     end
-    assert_nil activerecord_column_option('foos', 'created_at', 'limit')
-    assert_nil activerecord_column_option('foos', 'updated_at', 'limit')
+    assert_nil Foo.columns_hash['created_at'].limit
+    assert_nil Foo.columns_hash['updated_at'].limit
   end
 
   def test_invalid_datetime_precision_raises_error
@@ -48,14 +49,6 @@ class DateTimePrecisionTest < ActiveRecord::TestCase
     end
   end
 
-  def test_database_agrees_with_activerecord_about_precision
-    @connection.create_table(:foos, force: true) do |t|
-      t.timestamps precision: 4
-    end
-    assert_equal 4, database_datetime_precision('foos', 'created_at')
-    assert_equal 4, database_datetime_precision('foos', 'updated_at')
-  end
-
   def test_formatting_datetime_according_to_precision
     @connection.create_table(:foos, force: true) do |t|
       t.datetime :created_at, precision: 0
@@ -91,21 +84,5 @@ class DateTimePrecisionTest < ActiveRecord::TestCase
     end
   end
 
-  private
-
-  def database_datetime_precision(table_name, column_name)
-    results = @connection.exec_query("SELECT column_name, datetime_precision FROM information_schema.columns WHERE table_name = '#{table_name}'")
-    result = results.find do |result_hash|
-      result_hash["column_name"] == column_name
-    end
-    result && result["datetime_precision"].to_i
-  end
-
-  def activerecord_column_option(tablename, column_name, option)
-    result = @connection.columns(tablename).find do |column|
-      column.name == column_name
-    end
-    result && result.send(option)
-  end
 end
 end
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index d82a3040fc..07dbc8a53f 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -47,7 +47,7 @@ def in_memory_db?
 end
 
 def subsecond_precision_supported?
-  !current_adapter?(:MysqlAdapter, :Mysql2Adapter) || ActiveRecord::Base.connection.version >= '5.6.4'
+  ActiveRecord::Base.connection.supports_datetime_with_precision?
 end
 
 def mysql_enforcing_gtid_consistency?
diff --git a/activerecord/test/cases/time_precision_test.rb b/activerecord/test/cases/time_precision_test.rb
index ff7a81fe60..3b6e4dcc2b 100644
--- a/activerecord/test/cases/time_precision_test.rb
+++ b/activerecord/test/cases/time_precision_test.rb
@@ -10,6 +10,7 @@ class TimePrecisionTest < ActiveRecord::TestCase
 
   setup do
     @connection = ActiveRecord::Base.connection
+    Foo.reset_column_information
   end
 
   teardown do
@@ -20,8 +21,8 @@ class TimePrecisionTest < ActiveRecord::TestCase
     @connection.create_table(:foos, force: true)
     @connection.add_column :foos, :start,  :time, precision: 3
     @connection.add_column :foos, :finish, :time, precision: 6
-    assert_equal 3, activerecord_column_option('foos', 'start',  'precision')
-    assert_equal 6, activerecord_column_option('foos', 'finish', 'precision')
+    assert_equal 3, Foo.columns_hash['start'].precision
+    assert_equal 6, Foo.columns_hash['finish'].precision
   end
 
   def test_passing_precision_to_time_does_not_set_limit
@@ -29,8 +30,8 @@ class TimePrecisionTest < ActiveRecord::TestCase
       t.time :start,  precision: 3
       t.time :finish, precision: 6
     end
-    assert_nil activerecord_column_option('foos', 'start',  'limit')
-    assert_nil activerecord_column_option('foos', 'finish', 'limit')
+    assert_nil Foo.columns_hash['start'].limit
+    assert_nil Foo.columns_hash['finish'].limit
   end
 
   def test_invalid_time_precision_raises_error
@@ -42,15 +43,6 @@ class TimePrecisionTest < ActiveRecord::TestCase
     end
   end
 
-  def test_database_agrees_with_activerecord_about_precision
-    @connection.create_table(:foos, force: true) do |t|
-      t.time :start,  precision: 2
-      t.time :finish, precision: 4
-    end
-    assert_equal 2, database_datetime_precision('foos', 'start')
-    assert_equal 4, database_datetime_precision('foos', 'finish')
-  end
-
   def test_formatting_time_according_to_precision
     @connection.create_table(:foos, force: true) do |t|
       t.time :start,  precision: 0
@@ -88,21 +80,5 @@ class TimePrecisionTest < ActiveRecord::TestCase
     end
   end
 
-  private
-
-  def database_datetime_precision(table_name, column_name)
-    results = @connection.exec_query("SELECT column_name, datetime_precision FROM information_schema.columns WHERE table_name = '#{table_name}'")
-    result = results.find do |result_hash|
-      result_hash["column_name"] == column_name
-    end
-    result && result["datetime_precision"].to_i
-  end
-
-  def activerecord_column_option(tablename, column_name, option)
-    result = @connection.columns(tablename).find do |column|
-      column.name == column_name
-    end
-    result && result.send(option)
-  end
 end
 end