aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorAndrew White <andrew.white@unboxed.co>2019-03-18 16:51:33 +0000
committerAndrew White <andrew.white@unboxed.co>2019-03-18 17:02:34 +0000
commit58ac3f212f0dca31d8dc3c35ba13c14581d8b5f3 (patch)
tree33ca5cb87d3384e7a9ab986704211e31709676ba /activesupport/lib
parent014aa10fc0c2e1431235134c5f94c467e8c17cbd (diff)
downloadrails-58ac3f212f0dca31d8dc3c35ba13c14581d8b5f3.tar.gz
rails-58ac3f212f0dca31d8dc3c35ba13c14581d8b5f3.tar.bz2
rails-58ac3f212f0dca31d8dc3c35ba13c14581d8b5f3.zip
Fix Time#advance to work with dates before 1001-03-07
In #10634 the behavior of Time#advance was changed to maintain a proleptic gregorian calendar for dates before calendar reform. However it didn't full address dates a long time before calendar reform and they gradually drift away from the proleptic calendar the further you go back in time. Fix this by always converting the date to gregorian before calling advance which sets the reform date to -infinity.
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/time/calculations.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 120768dec5..f09a6271ad 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -170,8 +170,7 @@ class Time
options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
end
- d = to_date.advance(options)
- d = d.gregorian if d.julian?
+ d = to_date.gregorian.advance(options)
time_advanced_by_date = change(year: d.year, month: d.month, day: d.day)
seconds_to_advance = \
options.fetch(:seconds, 0) +