diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index f5a6880f56..7c76146cde 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -173,7 +173,7 @@ module ActiveRecord Time.send(Base.default_timezone, year, mon, mday, hour, min, sec, microsec) # Over/underflow to DateTime rescue ArgumentError, TypeError - zone_offset = if Base.default_timezone == :local then DateTime.now.offset else 0 end + zone_offset = Base.default_timezone == :local ? DateTime.local_offset : 0 # Append zero calendar reform start to account for dates skipped by calendar reform DateTime.new(year, mon, mday, hour, min, sec, zone_offset, 0) rescue nil end |