[Rails5] Simplify Date/Time Types.

* Use simple :datetime type name so we are included in `time_zone_aware_attributes` checks.
* Pass: BasicsTest#test_preserving_time_objects_with_time_with_zone_conversion_to_default_timezone_utc
* Pass: AttributeMethodsTest#test_setting_time_zone_aware_time_with_dst

Author: metaskills

lib/active_record/connection_adapters/sqlserver/type/datetime.rb

@@ -34,10 +34,6 @@ def quoted(value)
 
           private
 
-          def cast_value(value)
-            is_utc? ? super.try(:in_time_zone) : super
-          end
-
           def fast_string_to_time(string)
             fast_string_to_time_zone.strptime(string, fast_string_to_time_format).time
           rescue ArgumentError
@@ -49,21 +45,7 @@ def fast_string_to_time_format
           end
 
           def fast_string_to_time_zone
-            ::Time.zone || ActiveSupport::TimeZone.new('UTC')
-          end
-
-          # Copy of module ActiveModel::Type::Helpers::TimeValue with
-          # else condition using a zone for local parsing.
-          def new_time(year, mon, mday, hour, min, sec, microsec, offset = nil)
-            return if year.nil? || (year == 0 && mon == 0 && mday == 0)
-            if offset
-              time = ::Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
-              return unless time
-              time -= offset
-              is_utc? ? time : time.getlocal
-            else
-              fast_string_to_time_zone.local(year, mon, mday, hour, min, sec, microsec) rescue nil
-            end
+            ::Time.zone || ActiveSupport::TimeZone['UTC']
           end
 
         end

lib/active_record/connection_adapters/sqlserver/type/datetime2.rb

@@ -6,10 +6,6 @@ class DateTime2 < DateTime
 
           include TimeValueFractional2
 
-          def type
-            :datetime2
-          end
-
           def sqlserver_type
             "datetime2(#{precision.to_i})"
           end

lib/active_record/connection_adapters/sqlserver/type/datetimeoffset.rb

@@ -4,10 +4,6 @@ module SQLServer
       module Type
         class DateTimeOffset < DateTime2
 
-          def type
-            :datetimeoffset
-          end
-
           def sqlserver_type
             "datetimeoffset(#{precision.to_i})"
           end

lib/active_record/connection_adapters/sqlserver/type/time.rb

@@ -7,7 +7,8 @@ class Time < ActiveRecord::Type::Time
           include TimeValueFractional2
 
           def serialize(value)
-            return super unless value.acts_like?(:time)
+            value = super
+            return value unless value.acts_like?(:time)
             time = value.to_s(:_sqlserver_time).tap do |v|
               fraction = quote_fractional(value)
               v << ".#{fraction}"
@@ -34,7 +35,7 @@ def quoted(value)
           private
 
           def cast_value(value)
-            value = value.acts_like?(:time) ? value : super
+            value = super
             return if value.blank?
             value = value.change year: 2000, month: 01, day: 01
             apply_seconds_precision(value)

test/cases/coerced_tests.rb

@@ -745,17 +745,6 @@ def test_invalid_datetime_precision_raises_error_coerced
       end
     end
   end
-
-  # Original test uses `datetime` vs `datetime2` type which we dynamically use.
-  coerce_tests! :test_schema_dump_includes_datetime_precision
-  def test_schema_dump_includes_datetime_precision_coerced
-    @connection.create_table(:foos, force: true) do |t|
-      t.timestamps precision: 6
-    end
-    output = dump_table_schema("foos")
-    assert_match %r{t\.datetime2\s+"created_at",\s+precision: 6,\s+null: false$}, output
-    assert_match %r{t\.datetime2\s+"updated_at",\s+precision: 6,\s+null: false$}, output
-  end
 end
 
 

test/cases/column_test_sqlserver.rb

@@ -352,7 +352,7 @@ def assert_obj_set_and_save(attribute, value)
       skip 'datetime2 not supported in this protocal version' unless connection_dblib_73?
       col = column('datetime2_7')
       col.sql_type.must_equal           'datetime2(7)'
-      col.type.must_equal               :datetime2
+      col.type.must_equal               :datetime
       col.null.must_equal               true
       time = Time.utc 9999, 12, 31, 23, 59, 59, Rational(999999900, 1000)
       col.default.must_equal            time, "Nanoseconds were <#{col.default.nsec}> vs <999999900>"
@@ -417,7 +417,7 @@ def assert_obj_set_and_save(attribute, value)
       skip 'datetimeoffset not supported in this protocal version' unless connection_dblib_73?
       col = column('datetimeoffset_7')
       col.sql_type.must_equal           'datetimeoffset(7)'
-      col.type.must_equal               :datetimeoffset
+      col.type.must_equal               :datetime
       col.null.must_equal               true
       col.default.must_equal            Time.new(1984, 01, 24, 04, 20, 00, -28800).change(nsec: 123456700), "Nanoseconds <#{col.default.nsec}> vs <123456700>"
       obj.datetimeoffset_7.must_equal   Time.new(1984, 01, 24, 04, 20, 00, -28800).change(nsec: 123456700), "Nanoseconds were <#{obj.datetimeoffset_7.nsec}> vs <999999900>"

test/cases/schema_dumper_test_sqlserver.rb

@@ -26,9 +26,9 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     assert_line :date,              type: 'date',         limit: nil,           precision: nil,   scale: nil,  default: "01-01-0001"
     assert_line :datetime,          type: 'datetime',     limit: nil,           precision: nil,   scale: nil,  default: "01-01-1753 00:00:00.123"
     if connection_dblib_73?
-    assert_line :datetime2_7,       type: 'datetime2',    limit: nil,           precision: 7,     scale: nil,  default: "12-31-9999 23:59:59.9999999"
-    assert_line :datetime2_3,       type: 'datetime2',    limit: nil,           precision: 3,     scale: nil,  default: nil
-    assert_line :datetime2_1,       type: 'datetime2',    limit: nil,           precision: 1,     scale: nil,  default: nil
+    assert_line :datetime2_7,       type: 'datetime',     limit: nil,           precision: 7,     scale: nil,  default: "12-31-9999 23:59:59.9999999"
+    assert_line :datetime2_3,       type: 'datetime',     limit: nil,           precision: 3,     scale: nil,  default: nil
+    assert_line :datetime2_1,       type: 'datetime',     limit: nil,           precision: 1,     scale: nil,  default: nil
     end
     assert_line :smalldatetime,     type: 'smalldatetime',limit: nil,           precision: nil,   scale: nil,  default: "01-01-1901 15:45:00.0"
     if connection_dblib_73?
@@ -99,7 +99,7 @@ class SchemaDumperTestSQLServer < ActiveRecord::TestCase
     columns['sstimestamp_col'].sql_type.must_equal  'timestamp'
     assert_line :real_col,          type: 'real',         limit: nil,           precision: nil,   scale: nil,  default: nil
     assert_line :money_col,         type: 'money',        limit: nil,           precision: 19,    scale: 4,    default: nil
-    assert_line :datetime2_col,     type: 'datetime2',    limit: nil,           precision: 7,     scale: nil,  default: nil
+    assert_line :datetime2_col,     type: 'datetime',     limit: nil,           precision: 7,     scale: nil,  default: nil
     assert_line :smallmoney_col,    type: 'smallmoney',   limit: nil,           precision: 10,    scale: 4,    default: nil
     assert_line :char_col,          type: 'char',         limit: 1,             precision: nil,   scale: nil,  default: nil
     assert_line :varchar_col,       type: 'varchar',      limit: nil,           precision: nil,   scale: nil,  default: nil