Skip to content

Commit

Permalink
Do not truncate microseconds in DateTime.diff/3 (#14274)
Browse files Browse the repository at this point in the history
Closes #14273
  • Loading branch information
tfiedlerdejanze authored Feb 17, 2025
1 parent b393dcc commit 8f6cb5d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/elixir/lib/calendar/datetime.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1599,11 +1599,13 @@ defmodule DateTime do
end

naive_diff =
(datetime1 |> to_iso_days() |> Calendar.ISO.iso_days_to_unit(unit)) -
(datetime2 |> to_iso_days() |> Calendar.ISO.iso_days_to_unit(unit))
(datetime1 |> to_iso_days() |> Calendar.ISO.iso_days_to_unit(:microsecond)) -
(datetime2 |> to_iso_days() |> Calendar.ISO.iso_days_to_unit(:microsecond))

offset_diff = utc_offset2 + std_offset2 - (utc_offset1 + std_offset1)
naive_diff + System.convert_time_unit(offset_diff, :second, unit)

System.convert_time_unit(naive_diff, :microsecond, unit) +
System.convert_time_unit(offset_diff, :second, unit)
end

@doc """
Expand Down
18 changes: 18 additions & 0 deletions lib/elixir/test/elixir/calendar/datetime_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,24 @@ defmodule DateTimeTest do
# Test with a non-struct map conforming to Calendar.datetime
assert DateTime.diff(Map.from_struct(dt1), Map.from_struct(dt2)) == 3_281_904_000
end

test "diff with microseconds" do
datetime = ~U[2023-02-01 10:30:10.123456Z]

in_almost_7_days =
datetime
|> DateTime.add(7, :day)
|> DateTime.add(-1, :microsecond)

assert DateTime.diff(in_almost_7_days, datetime, :day) == 6
end

test "diff in microseconds" do
datetime1 = ~U[2023-02-01 10:30:10.000000Z]
datetime2 = DateTime.add(datetime1, 1234, :microsecond)

assert DateTime.diff(datetime1, datetime2, :microsecond) == -1234
end
end

describe "from_naive" do
Expand Down

0 comments on commit 8f6cb5d

Please sign in to comment.