Fix date loader and dumper

Author: ankhers

lib/mongo_ecto.ex

@@ -437,29 +437,22 @@ defmodule Mongo.Ecto do
   def loaders(:binary,          type), do: [&load_binary/1,   type]
   def loaders(_base,            type), do: [type]
 
-  defp load_time(time),
-    do: Time.to_erl(time)
-  defp load_time(_),
-    do: :error
+  defp load_time(time), do: Time.to_erl(time)
+  defp load_time(_), do: :error
 
-  defp load_date(date),
-    do: Date.from_erl(date)
-  defp load_date(_),
-    do: :error
+  defp load_date(date), do: {:ok, date |> DateTime.to_date() |> Date.to_erl()}
+  defp load_date(date), do: :error
 
   defp load_datetime(datetime) do
       naive = DateTime.to_naive(datetime)
       {date, {h, m, s}} = NaiveDateTime.to_erl(naive)
       {x, _} = naive.microsecond
     {:ok, {date, {h, m, s, x}}}
   end
-  defp load_datetime(_),
-    do: :error
+  defp load_datetime(_), do: :error
 
-  defp load_binary(%BSON.Binary{binary: binary}),
-    do: {:ok, binary}
-  defp load_binary(_),
-    do: :error
+  defp load_binary(%BSON.Binary{binary: binary}), do: {:ok, binary}
+  defp load_binary(_), do: :error
 
   defp load_objectid(%BSON.ObjectId{} = objectid) do
     try do
@@ -486,8 +479,13 @@ defmodule Mongo.Ecto do
   defp dump_time(_),
     do: :error
 
-  defp dump_date({_, _, _} = date),
-    do: Date.from_erl!(date)
+  defp dump_date({_, _, _} = date) do
+    dt = {date, {0, 0, 0}}
+    |> NaiveDateTime.from_erl!()
+    |> datetime_from_naive!("Etc/UTC")
+
+    {:ok, dt}
+  end
   defp dump_date(_),
     do: :error
 

mix.lock

@@ -1,11 +1,11 @@
-%{"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm"},
+%{"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
   "db_connection": {:git, "https://github.com/elixir-ecto/db_connection.git", "24473f673760ded3636f3086e0e2d768605ea1e8", [ref: "24473f6"]},
-  "decimal": {:hex, :decimal, "1.4.0", "fac965ce71a46aab53d3a6ce45662806bdd708a4a95a65cde8a12eb0124a1333", [:mix], [], "hexpm"},
-  "dialyze": {:hex, :dialyze, "0.2.1", "9fb71767f96649020d769db7cbd7290059daff23707d6e851e206b1fdfa92f9d", [:mix], [], "hexpm"},
-  "earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], [], "hexpm"},
-  "ecto": {:hex, :ecto, "2.1.6", "29b45f393c2ecd99f83e418ea9b0a2af6078ecb30f401481abac8a473c490f84", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, repo: "hexpm", optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, repo: "hexpm", optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, repo: "hexpm", optional: true]}], "hexpm"},
-  "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"},
-  "inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"},
+  "decimal": {:hex, :decimal, "1.4.0", "fac965ce71a46aab53d3a6ce45662806bdd708a4a95a65cde8a12eb0124a1333", [:mix], []},
+  "dialyze": {:hex, :dialyze, "0.2.1", "9fb71767f96649020d769db7cbd7290059daff23707d6e851e206b1fdfa92f9d", [:mix], []},
+  "earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], []},
+  "ecto": {:hex, :ecto, "2.1.6", "29b45f393c2ecd99f83e418ea9b0a2af6078ecb30f401481abac8a473c490f84", [:mix], [{:db_connection, "~> 1.1", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.2", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, optional: true]}, {:poison, "~> 2.2 or ~> 3.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.13.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, optional: true]}]},
+  "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, optional: false]}]},
+  "inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, optional: false]}]},
   "mongodb": {:git, "https://github.com/ankhers/mongodb.git", "d2d0954da6385a525d8d3577d28c19fb0b215349", [branch: "reboot_replica_sets"]},
-  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"},
-  "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"}}
+  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []},
+  "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []}}