post rebase fixes

Author: v0idpwn

Diff for: lib/ecto/embedded.ex

@@ -170,8 +170,8 @@ defmodule Ecto.Embedded do
 
         {:embed, %{virtual: true}} ->
           acc
-      end)
-    end
+      end
+    end)
   end
 
   defp prepare_each(%{cardinality: :one}, nil, _adapter, _repo, _repo_action) do

Diff for: test/ecto/query/planner_test.exs

@@ -601,7 +601,8 @@ defmodule Ecto.Query.PlannerTest do
 
   test "plan: generates a cache key" do
     {_query, _cast_params, _dump_params, key} = plan(from(Post, []))
-    assert key == [:all, {:from, {"posts", Post, 23210922, "my_prefix"}, []}]
+
+    assert key == [:all, {:from, {"posts", Post, 132715331, "my_prefix"}, []}]
 
     query =
       from(
@@ -622,7 +623,6 @@ defmodule Ecto.Query.PlannerTest do
       )
 
     {_query, _cast_params, _dump_params, key} = plan(%{query | prefix: "foo"})
-<<<<<<< HEAD
 
     assert key == [
              :all,
@@ -634,19 +634,18 @@ defmodule Ecto.Query.PlannerTest do
               [
                 {:inner, {"comments", Comment, 38_292_156, "world"}, true, ["join hint"]}
               ]},
-             {:from, {"posts", Post, 50_009_106, "hello"}, ["hint"]},
+             {:from, {"posts", Post, 132715331, "hello"}, ["hint"]},
              {:select, 1}
            ]
-=======
-    assert key == [:all,
-                   {:lock, "foo"},
-                   {:prefix, "foo"},
-                   {:limit, {true, 1}},
-                   {:where, [{:and, {:is_nil, [], [nil]}}, {:or, {:is_nil, [], [nil]}}]},
-                   {:join, [{:inner, {"comments", Comment, 38292156, "world"}, true, ["join hint"]}]},
-                   {:from, {"posts", Post, 23210922, "hello"}, ["hint"]},
-                   {:select, 1}]
->>>>>>> e779c5c7 (Fix tests)
+
+   assert key == [:all,
+       {:lock, "foo"},
+       {:prefix, "foo"},
+       {:limit, {true, 1}},
+       {:where, [{:and, {:is_nil, [], [nil]}}, {:or, {:is_nil, [], [nil]}}]},
+       {:join, [{:inner, {"comments", Comment, 38292156, "world"}, true, ["join hint"]}]},
+       {:from, {"posts", Post, 132715331, "hello"}, ["hint"]},
+       {:select, 1}]
   end
 
   test "plan: generates a cache key for in based on the adapter" do
@@ -966,7 +965,7 @@ defmodule Ecto.Query.PlannerTest do
              [
                :all,
                {:aliases, %{post: 0}},
-               {:from, {"posts", Ecto.Query.PlannerTest.Post, 50_009_106, "my_prefix"}, []},
+               {:from, {"posts", Ecto.Query.PlannerTest.Post, 132715331, "my_prefix"}, []},
                {:select,
                 {{:%{}, [],
                   [