Skip to content

Commit d35b39a

Browse files
committed
change :millisecond to :milliseconds
1 parent 2925cde commit d35b39a

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

lib/rethinkdb/pseudotypes.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ defmodule RethinkDB.Pseudotypes do
6868
end
6969
epoch_time * 1000
7070
|> trunc()
71-
|> DateTime.from_unix!(:millisecond)
71+
|> DateTime.from_unix!(:milliseconds)
7272
|> struct(utc_offset: seconds, zone_abbr: zone_abbr, time_zone: time_zone)
7373
end
7474
end

lib/rethinkdb/query/macros.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ defmodule RethinkDB.Query.Macros do
118118
String.pad_leading(Integer.to_string(offset_minute), 2, "0")
119119
wrap(%{
120120
"$reql_type$" => "TIME",
121-
"epoch_time" => DateTime.to_unix(t, :millisecond) / 1000,
121+
"epoch_time" => DateTime.to_unix(t, :milliseconds) / 1000,
122122
"timezone" => time_zone
123123
})
124124
end

test/query/date_time_test.exs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ defmodule DateTimeTest do
2323

2424
test "time native" do
2525
{:ok, %Record{data: data}} = time(1970,1,1,"Z") |> run
26-
assert data == DateTime.from_unix!(0, :millisecond)
26+
assert data == DateTime.from_unix!(0, :milliseconds)
2727
{:ok, %Record{data: data}} = time(1970,1,1,0,0,1,"Z") |> run [binary_format: :native]
28-
assert data == DateTime.from_unix!(1000, :millisecond)
28+
assert data == DateTime.from_unix!(1000, :milliseconds)
2929
end
3030

3131
test "time raw" do
@@ -37,7 +37,7 @@ defmodule DateTimeTest do
3737

3838
test "epoch_time native" do
3939
{:ok, %Record{data: data}} = epoch_time(1) |> run
40-
assert data == DateTime.from_unix!(1000, :millisecond)
40+
assert data == DateTime.from_unix!(1000, :milliseconds)
4141
end
4242

4343
test "epoch_time raw" do
@@ -48,9 +48,9 @@ defmodule DateTimeTest do
4848

4949
test "iso8601 native" do
5050
{:ok, %Record{data: data}} = iso8601("1970-01-01T00:00:00+00:00") |> run
51-
assert data == DateTime.from_unix!(0, :millisecond)
51+
assert data == DateTime.from_unix!(0, :milliseconds)
5252
{:ok, %Record{data: data}} = iso8601("1970-01-01T00:00:00", default_timezone: "+01:00") |> run
53-
assert data == DateTime.from_unix!(-3600000, :millisecond) |> struct(utc_offset: 3600, time_zone: "Etc/GMT-1", zone_abbr: "+01:00")
53+
assert data == DateTime.from_unix!(-3600000, :milliseconds) |> struct(utc_offset: 3600, time_zone: "Etc/GMT-1", zone_abbr: "+01:00")
5454
end
5555

5656
test "iso8601 raw" do
@@ -64,7 +64,7 @@ defmodule DateTimeTest do
6464

6565
test "in_timezone native" do
6666
{:ok, %Record{data: data}} = epoch_time(0) |> in_timezone("+01:00") |> run
67-
assert data == DateTime.from_unix!(0, :millisecond) |> struct(utc_offset: 3600, time_zone: "Etc/GMT-1", zone_abbr: "+01:00")
67+
assert data == DateTime.from_unix!(0, :milliseconds) |> struct(utc_offset: 3600, time_zone: "Etc/GMT-1", zone_abbr: "+01:00")
6868
end
6969

7070
test "in_timezone raw" do
@@ -90,7 +90,7 @@ defmodule DateTimeTest do
9090

9191
test "date native" do
9292
{:ok, %Record{data: data}} = epoch_time(5) |> date |> run
93-
assert data == DateTime.from_unix!(0, :millisecond)
93+
assert data == DateTime.from_unix!(0, :milliseconds)
9494
end
9595

9696
test "date raw" do

0 commit comments

Comments
 (0)