Merge pull request #52084 from jhawthorn/time_with_zone_always_time
Remove dead code for DateTime-backed TimeWithZone
This commit is contained in:
commit
4867559a10
@ -300,7 +300,7 @@ def +(other)
|
|||||||
if duration_of_variable_length?(other)
|
if duration_of_variable_length?(other)
|
||||||
method_missing(:+, other)
|
method_missing(:+, other)
|
||||||
else
|
else
|
||||||
result = utc.acts_like?(:date) ? utc.since(other) : utc + other rescue utc.since(other)
|
result = utc + other
|
||||||
result.in_time_zone(time_zone)
|
result.in_time_zone(time_zone)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -336,7 +336,7 @@ def -(other)
|
|||||||
elsif duration_of_variable_length?(other)
|
elsif duration_of_variable_length?(other)
|
||||||
method_missing(:-, other)
|
method_missing(:-, other)
|
||||||
else
|
else
|
||||||
result = utc.acts_like?(:date) ? utc.ago(other) : utc - other rescue utc.ago(other)
|
result = utc - other
|
||||||
result.in_time_zone(time_zone)
|
result.in_time_zone(time_zone)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -537,7 +537,6 @@ def respond_to?(sym, include_priv = false)
|
|||||||
# Ensure proxy class responds to all methods that underlying time instance
|
# Ensure proxy class responds to all methods that underlying time instance
|
||||||
# responds to.
|
# responds to.
|
||||||
def respond_to_missing?(sym, include_priv)
|
def respond_to_missing?(sym, include_priv)
|
||||||
return false if sym.to_sym == :acts_like_date?
|
|
||||||
time.respond_to?(sym, include_priv)
|
time.respond_to?(sym, include_priv)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -394,9 +394,10 @@ def test_plus_with_integer_when_self_wraps_datetime
|
|||||||
assert_equal DateTime.civil(1999, 12, 31, 19, 0, 5), (twz + 5).time
|
assert_equal DateTime.civil(1999, 12, 31, 19, 0, 5), (twz + 5).time
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_plus_when_crossing_time_class_limit
|
def test_no_limit_on_times
|
||||||
twz = ActiveSupport::TimeWithZone.new(Time.utc(2038, 1, 19), @time_zone)
|
twz = ActiveSupport::TimeWithZone.new(Time.utc(2000, 1, 1), @time_zone)
|
||||||
assert_equal [0, 0, 19, 19, 1, 2038], (twz + 86_400).to_a[0, 6]
|
assert_equal [0, 0, 19, 31, 12, 11999], (twz + 10_000.years).to_a[0, 6]
|
||||||
|
assert_equal [0, 0, 19, 31, 12, -8001], (twz - 10_000.years).to_a[0, 6]
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_plus_with_duration
|
def test_plus_with_duration
|
||||||
|
Loading…
Reference in New Issue
Block a user