Manually convert date/time structs to BSON.DateTime

Author: ankhers

lib/mongo_ecto.ex

@@ -426,8 +426,7 @@ defmodule Mongo.Ecto do
   end
 
   @doc false
-  def loaders(Ecto.Time,  type), do: [&load_time/1, type]
-  def loaders(Ecto.Date,  type), do: [&load_date/1, type]
+  def loaders(:time,      type), do: [&load_time/1, type]
   def loaders(:date,      type), do: [&load_date/1, type]
   def loaders(:datetime,  type), do: [&load_datetime/1, type]
   def loaders(:binary_id, type), do: [&load_objectid/1, type]
@@ -436,7 +435,7 @@ defmodule Mongo.Ecto do
   def loaders(_base,      type), do: [type]
 
   defp load_time(%BSON.DateTime{} = time) do
-    {{_, _, _}, time} = BSON.DateTime.to_datetime(time)
+    {{_,_,_}, time} = BSON.DateTime.to_datetime(time)
     {:ok, time}
   end
   defp load_time(_),
@@ -446,8 +445,6 @@ defmodule Mongo.Ecto do
     {date, {_, _, _, _}} = BSON.DateTime.to_datetime(date)
     {:ok, date}
   end
-  defp load_date(%Ecto.Date{} = date),
-    do: Ecto.Date.to_erl(date)
   defp load_date(_),
     do: :error
 

lib/mongo_ecto/conversions.ex

@@ -54,6 +54,12 @@ defmodule Mongo.Ecto.Conversions do
     do: map(list, &from_ecto_pk(&1, pk))
   def from_ecto_pk(value, _pk) when is_literal(value),
     do: {:ok, value}
+  def from_ecto_pk({{_,_,_},{_,_,_,_}} = value, _pk),
+    do: Ecto.Type.adapter_dump(Mongo.Ecto, :datetime, value)
+  def from_ecto_pk({_,_,_} = value, _pk),
+    do: Ecto.Type.adapter_dump(Mongo.Ecto, :date, value)
+  def from_ecto_pk({_,_,_,_} = value, _pk),
+    do: Ecto.Type.adapter_dump(Mongo.Ecto, :time, value)
   def from_ecto_pk(_value, _pk),
     do: :error