Do not rebuild ObjectId from driver

elixir-mongo · Dec 17, 2015 · b7abfef · b7abfef
1 parent 15e6c65
commit b7abfef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/mongo_ecto.ex b/lib/mongo_ecto.ex
@@ -410,8 +410,6 @@ defmodule Mongo.Ecto do
   def load(_type, nil),
     do: {:ok, nil}
   # wat
-  def load(:binary_id, <<_::binary-12>> = binary),
-    do: {:ok, ObjectID.encode(binary)}
   def load(:binary_id, %BSON.ObjectId{value: value}),
     do: ObjectID.load(value)
   def load(:binary, %BSON.Binary{binary: value}),
@@ -436,8 +434,6 @@ defmodule Mongo.Ecto do
   @doc false
   def dump(_type, nil),
     do: {:ok, nil}
-  def dump(:binary_id, <<_::binary-12>> = binary),
-    do: {:ok, binary}
   def dump(:binary_id, data),
     do: ObjectID.dump(data)
   def dump(:binary, value),
@@ -521,8 +517,8 @@ defmodule Mongo.Ecto do
     normalized = NormalizedQuery.insert(meta, params, pk)
 
     case Connection.insert(repo.__mongo_pool__, normalized, opts) do
-      {:ok, %{inserted_id: %BSON.ObjectId{value: value}}} ->
-        {:ok, [{pk, value}]}
+      {:ok, %{inserted_id: objid}} ->
+        {:ok, [{pk, objid}]}
       other ->
         other
     end

diff --git a/lib/mongo_ecto/conversions.ex b/lib/mongo_ecto/conversions.ex
@@ -46,7 +46,7 @@ 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),
+  def from_ecto_pk(_value, _pk),
     do: :error
 
   defp document(doc, pk) do