diff options
| author | Geoff Buesing <gbuesing@gmail.com> | 2007-11-24 04:59:21 +0000 |
|---|---|---|
| committer | Geoff Buesing <gbuesing@gmail.com> | 2007-11-24 04:59:21 +0000 |
| commit | becdb49186c575bf96a82a949ac04b6078680d52 (patch) | |
| tree | 48c91b2df8feba4a7e6795c161a2e92970bc323c /activerecord/lib/active_record | |
| parent | d84846a636fbc180b3d6fcf52aa8559e1b7bb960 (diff) | |
| download | rails-becdb49186c575bf96a82a949ac04b6078680d52.tar.gz rails-becdb49186c575bf96a82a949ac04b6078680d52.tar.bz2 rails-becdb49186c575bf96a82a949ac04b6078680d52.zip | |
Honor Ruby's default calendar reform setting when creating DateTime objects via ActiveRecord's Time -> DateTime overflow, Time#time_with_datetime_fallback, Time#to_datetime, Date#to_datetime and String#to_datetime. Closes #10201
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 3 |
1 files changed, 1 insertions, 2 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 c6cdc776d6..39064d4d13 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -174,8 +174,7 @@ module ActiveRecord # Over/underflow to DateTime rescue ArgumentError, TypeError 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 + DateTime.civil(year, mon, mday, hour, min, sec, zone_offset) rescue nil end def fast_string_to_date(string) |