diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-11-05 22:29:52 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-11-05 22:29:52 +0000 |
| commit | 7e6bb82f44782deeedc81886b6f2abd7f69a982c (patch) | |
| tree | d599e794a76cf27eab8759af16b5a32eb59541f2 /activerecord | |
| parent | 47576a646bd99d431f4217b20b7625bdd3444171 (diff) | |
| download | rails-7e6bb82f44782deeedc81886b6f2abd7f69a982c.tar.gz rails-7e6bb82f44782deeedc81886b6f2abd7f69a982c.tar.bz2 rails-7e6bb82f44782deeedc81886b6f2abd7f69a982c.zip | |
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
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 |