From 7e6bb82f44782deeedc81886b6f2abd7f69a982c Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Mon, 5 Nov 2007 22:29:52 +0000 Subject: Use the safe conversion code introduced in earlier commit. References #10068 [gbuesing] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8077 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../active_record/connection_adapters/abstract/schema_definitions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record') 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 -- cgit v1.2.3