Merge remote-tracking branch 'mbenatti/ecto-2.1' into ecto-2.1

Author: ankhers

lib/mongo_ecto.ex

@@ -377,6 +377,8 @@ defmodule Mongo.Ecto do
       @doc false
       def __pool__, do: {unquote(pool_name), unquote(Macro.escape(norm_config))}
 
+      def in_transaction?, do: false
+
       defoverridable [__pool__: 0]
     end
   end
@@ -426,13 +428,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 +472,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 +541,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 +558,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
@@ -711,6 +715,12 @@ defmodule Mongo.Ecto do
     end
   end
 
+  #
+  # Transaction callbacks
+  #
+
+  def in_transaction?(_repo), do: false
+
   ## Mongo specific calls
 
   @doc """

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

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