Upgrade to use ecto 2.1 instead of 2.0

Author: Bharat311

lib/mongo_ecto.ex

@@ -426,13 +426,14 @@ defmodule Mongo.Ecto do
   end
 
   @doc false
-  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]
-  def loaders(:uuid,      type), do: [&load_binary/1,   type]
-  def loaders(:binary,    type), do: [&load_binary/1,   type]
-  def loaders(_base,      type), do: [type]
+  def loaders(:time,            type), do: [&load_time/1, type]
+  def loaders(:date,            type), do: [&load_date/1, type]
+  def loaders(:utc_datetime,    type), do: [&load_datetime/1, type]
+  def loaders(:naive_datetime,  type), do: [&load_datetime/1, type]
+  def loaders(:binary_id,       type), do: [&load_objectid/1, type]
+  def loaders(:uuid,            type), do: [&load_binary/1,   type]
+  def loaders(:binary,          type), do: [&load_binary/1,   type]
+  def loaders(_base,            type), do: [type]
 
   defp load_time(%BSON.DateTime{} = time) do
     {{_,_,_}, time} = BSON.DateTime.to_datetime(time)
@@ -469,13 +470,14 @@ defmodule Mongo.Ecto do
   defp load_objectid(_), do: :error
 
   @doc false
-  def dumpers(:time,      type), do: [type, &dump_time/1]
-  def dumpers(:date,      type), do: [type, &dump_date/1]
-  def dumpers(:datetime,  type), do: [type, &dump_datetime/1]
-  def dumpers(:binary_id, type), do: [type, &dump_objectid/1]
-  def dumpers(:uuid,      type), do: [type, &dump_binary(&1, :uuid)]
-  def dumpers(:binary,    type), do: [type, &dump_binary(&1, :generic)]
-  def dumpers(_base,      type), do: [type]
+  def dumpers(:time,            type), do: [type, &dump_time/1]
+  def dumpers(:date,            type), do: [type, &dump_date/1]
+  def dumpers(:utc_datetime,    type), do: [type, &dump_datetime/1]
+  def dumpers(:naive_datetime,  type), do: [type, &dump_datetime/1]
+  def dumpers(:binary_id,       type), do: [type, &dump_objectid/1]
+  def dumpers(:uuid,            type), do: [type, &dump_binary(&1, :uuid)]
+  def dumpers(:binary,          type), do: [type, &dump_binary(&1, :generic)]
+  def dumpers(_base,            type), do: [type]
 
   defp dump_time({_, _, _, _} = time),
     do: {:ok, BSON.DateTime.from_datetime({{0, 0, 0}, time})}
@@ -537,13 +539,13 @@ defmodule Mongo.Ecto do
   end
 
   @doc false
-  def insert(_repo, meta, _params, [_|_] = returning, _opts) do
+  def insert(_repo, meta, _params, _on_conflict, [_|_] = returning, _opts) do
     raise ArgumentError,
       "MongoDB adapter does not support :read_after_writes in models. " <>
       "The following fields in #{inspect meta.schema} are tagged as such: #{inspect returning}"
   end
 
-  def insert(repo, meta, params, [], opts) do
+  def insert(repo, meta, params, _, [], opts) do
     normalized = NormalizedQuery.insert(meta, params)
 
     case Connection.insert(repo, normalized, opts) do
@@ -554,7 +556,7 @@ defmodule Mongo.Ecto do
     end
   end
 
-  def insert_all(repo, meta, fields, params, returning, opts) do
+  def insert_all(repo, meta, fields, params, _, returning, opts) do
     normalized = NormalizedQuery.insert(meta, params)
 
     case Connection.insert_all(repo, normalized, opts) do

lib/mongo_ecto/normalized_query.ex

@@ -225,7 +225,7 @@ defmodule Mongo.Ecto.NormalizedQuery do
 
   defp query(%Query{wheres: wheres} = query, params, {_coll, _model, pk}) do
     wheres
-    |> Enum.map(fn %Query.QueryExpr{expr: expr} ->
+    |> Enum.map(fn %Query.BooleanExpr{expr: expr} ->
       pair(expr, params, pk, query, "where clause")
     end)
     |> :lists.flatten

mix.exs

@@ -21,7 +21,7 @@ defmodule Mongo.Ecto.Mixfile do
   defp deps do
     [
       {:mongodb, "~> 0.2.0"},
-      {:ecto, "~> 2.0.0"},
+      {:ecto, "~> 2.1.0"},
       {:dialyze, "~> 0.2.0", only: :dev},
       {:excoveralls, "~> 0.5", only: :test},
       {:inch_ex, "~> 0.5", only: :docs},

mix.lock

@@ -1,10 +1,10 @@
 %{"certifi": {:hex, :certifi, "0.7.0", "861a57f3808f7eb0c2d1802afeaae0fa5de813b0df0979153cbafcd853ababaf", [:rebar3], []},
   "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
-  "db_connection": {:hex, :db_connection, "1.1.0", "b2b88db6d7d12f99997b584d09fad98e560b817a20dab6a526830e339f54cdb3", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, optional: true]}]},
+  "db_connection": {:hex, :db_connection, "1.1.2", "2865c2a4bae0714e2213a0ce60a1b12d76a6efba0c51fbda59c9ab8d1accc7a8", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: true]}, {:sbroker, "~> 1.0", [hex: :sbroker, optional: true]}]},
   "decimal": {:hex, :decimal, "1.3.1", "157b3cedb2bfcb5359372a7766dd7a41091ad34578296e951f58a946fcab49c6", [:mix], []},
   "dialyze": {:hex, :dialyze, "0.2.1", "9fb71767f96649020d769db7cbd7290059daff23707d6e851e206b1fdfa92f9d", [:mix], []},
   "earmark": {:hex, :earmark, "1.1.1", "433136b7f2e99cde88b745b3a0cfc3fbc81fe58b918a09b40fce7f00db4d8187", [:mix], []},
-  "ecto": {:hex, :ecto, "2.0.6", "9dcbf819c2a77f67a66b83739b7fcc00b71aaf6c100016db4f798930fa4cfd47", [:mix], [{:db_connection, "~> 1.0", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.1.2 or ~> 1.2", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.8.0", [hex: :mariaex, optional: true]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.12.0", [hex: :postgrex, optional: true]}, {:sbroker, "~> 1.0-beta", [hex: :sbroker, optional: true]}]},
+  "ecto": {:hex, :ecto, "2.1.4", "d1ba932813ec0e0d9db481ef2c17777f1cefb11fc90fa7c142ff354972dfba7e", [: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.14.5", "c0433c8117e948404d93ca69411dd575ec6be39b47802e81ca8d91017a0cf83c", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
   "excoveralls": {:hex, :excoveralls, "0.6.2", "0e993d096f1fbb6e70a3daced5c89aac066bda6bce57829622aa2d1e2b338cfb", [:mix], [{:exjsx, "~> 3.0", [hex: :exjsx, optional: false]}, {:hackney, ">= 0.12.0", [hex: :hackney, optional: false]}]},
   "exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, optional: false]}]},
@@ -15,6 +15,6 @@
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], []},
   "mimerl": {:hex, :mimerl, "1.0.2", "993f9b0e084083405ed8252b99460c4f0563e41729ab42d9074fd5e52439be88", [:rebar3], []},
   "mongodb": {:hex, :mongodb, "0.2.0", "95f85074534bb0a65c4983995903a458e36d0b096f62c1bbdd56bc196f48cf80", [:mix], [{:connection, "~> 1.0", [hex: :connection, optional: false]}, {:db_connection, "~> 1.0", [hex: :db_connection, optional: false]}]},
-  "poison": {:hex, :poison, "2.2.0", "4763b69a8a77bd77d26f477d196428b741261a761257ff1cf92753a0d4d24a63", [:mix], []},
+  "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], []},
   "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []},
   "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.1", "28a4d65b7f59893bc2c7de786dec1e1555bd742d336043fe644ae956c3497fbe", [:make, :rebar], []}}

test/mongo_ecto/normalized_query_new_test.exs

@@ -44,8 +44,8 @@ defmodule Mongo.Ecto.NormalizedQueryNewTest do
   end
 
   defp normalize(query, operation \\ :all) do
-    {query, params, _key} = Ecto.Query.Planner.prepare(query, operation, Mongo.Ecto)
-    query = Ecto.Query.Planner.normalize(query, operation, Mongo.Ecto)
+    {query, params, _key} = Ecto.Query.Planner.prepare(query, operation, Mongo.Ecto, 0)
+    query = Ecto.Query.Planner.normalize(query, operation, Mongo.Ecto, 0)
     apply(Mongo.Ecto.NormalizedQuery, operation, [query, params])
   end