Merge remote-tracking branch 'ecto3-fork/smpallen99#394'

config/test.exs

@@ -12,7 +12,6 @@ config :coherence, TestCoherenceWeb.Endpoint,
 config :coherence, ecto_repos: [TestCoherence.Repo]
 
 config :coherence, TestCoherence.Repo,
-  adapter: Ecto.Adapters.Postgres,
   username: System.get_env("DB_USERNAME") || "postgres",
   password: System.get_env("DB_PASSWORD") || "postgres",
   database: "coherence_test",

lib/mix/tasks/coh.clean.ex

@@ -306,7 +306,7 @@ defmodule Mix.Tasks.Coh.Clean do
 
   defp do_remove!(config, repo) do
     ensure_repo(repo, [])
-    path = Path.relative_to(migrations_path(repo), Mix.Project.app_path())
+    path = Path.relative_to(Ecto.Migrator.migrations_path(repo), Mix.Project.app_path())
 
     case Path.wildcard(path <> "/*coherence*") do
       [] ->

lib/mix/tasks/coh.install.ex

@@ -680,7 +680,7 @@ defmodule Mix.Tasks.Coh.Install do
           path
 
         _ ->
-          Path.relative_to(migrations_path(repo), Mix.Project.app_path())
+          Path.relative_to(Ecto.Migrator.migrations_path(repo), Mix.Project.app_path())
       end
 
     file = Path.join(path, "#{current_timestamp}_#{underscore(name)}.exs")

mix.exs

@@ -27,17 +27,8 @@ defmodule Coherence.Mixfile do
   def application do
     [
       mod: {Coherence, []},
-      applications: [
+      extra_applications: [
         :logger,
-        :comeonin,
-        :ecto,
-        :elixir_uuid,
-        :phoenix_swoosh,
-        :timex_ecto,
-        :tzdata,
-        :plug,
-        :phoenix,
-        :phoenix_html
       ]
     ]
   end
@@ -47,7 +38,8 @@ defmodule Coherence.Mixfile do
 
   defp deps do
     [
-      {:ecto, "~> 2.0"},
+      {:ecto, "~> 3.0"},
+      {:ecto_sql, "~> 3.0"},
       {:comeonin, "~> 4.0"},
       {:bcrypt_elixir, "~> 1.1"},
       {:phoenix, "~> 1.3"},
@@ -56,7 +48,6 @@ defmodule Coherence.Mixfile do
       {:elixir_uuid, "~> 1.2"},
       {:phoenix_swoosh, "~> 0.2"},
       {:timex, "~> 3.3"},
-      {:timex_ecto, "~> 3.3"},
       {:floki, "~> 0.19", only: :test},
       {:ex_doc, "~> 0.18.0", only: :dev},
       {:earmark, "~> 1.2", only: :dev, override: true},

test/schema_test.exs

@@ -100,7 +100,7 @@ defmodule CoherenceTest.Schema do
     assert cs.errors == [
              password:
                {"should be at least %{count} character(s)",
-                [count: 4, validation: :length, min: 4]}
+                [count: 4, validation: :length, kind: :min]}
            ]
   end
 

test/support/repo.exs

@@ -1,3 +1,3 @@
 defmodule TestCoherence.Repo do
-  use Ecto.Repo, otp_app: :coherence
+  use Ecto.Repo, otp_app: :coherence, adapter: Ecto.Adapters.Postgres
 end

test/support/schema.exs

@@ -13,7 +13,7 @@ defmodule TestCoherence.User do
   end
 
   @required_fields ~w(email name)a
-  @optional_fields ~w() ++ coherence_fields()
+  @optional_fields coherence_fields() |> Enum.map(&String.to_atom(&1))
 
   def changeset(model, params \\ %{}) do
     model
@@ -28,7 +28,7 @@ defmodule TestCoherence.User do
     model
     |> cast(
       params,
-      ~w(password password_confirmation reset_password_token reset_password_sent_at)
+      ~w(password password_confirmation reset_password_token reset_password_sent_at)a
     )
     |> validate_coherence_password_reset(params)
   end
@@ -63,7 +63,7 @@ defmodule TestCoherence.Invitation do
 
   def changeset(model, params \\ %{}) do
     model
-    |> cast(params, ~w(name email token))
+    |> cast(params, ~w(name email token)a)
     |> validate_required([:name, :email])
     |> unique_constraint(:email)
     |> validate_format(:email, ~r/@/)
@@ -98,7 +98,7 @@ defmodule TestCoherence.Account do
     model
     |> cast(
       params,
-      ~w(password password_confirmation reset_password_token reset_password_sent_at)
+      ~w(password password_confirmation reset_password_token reset_password_sent_at)a
     )
     |> validate_coherence_password_reset(params)
   end
@@ -134,7 +134,7 @@ defmodule TestCoherence.Coherence.User do
     model
     |> cast(
       params,
-      ~w(password password_confirmation reset_password_token reset_password_sent_at)
+      ~w(password password_confirmation reset_password_token reset_password_sent_at)a
     )
     |> validate_coherence_password_reset(params)
   end
@@ -155,7 +155,7 @@ defmodule TestCoherence.Coherence.Invitation do
 
   def changeset(model, params \\ %{}) do
     model
-    |> cast(params, ~w(name email token))
+    |> cast(params, ~w(name email token)a)
     |> validate_required([:name, :email])
     |> unique_constraint(:email)
     |> validate_format(:email, ~r/@/)
@@ -180,7 +180,7 @@ defmodule TestCoherence.Coherence.Account do
   end
 
   @required_fields ~w(email name)a
-  @optional_fields ~w() ++ coherence_fields()
+  @optional_fields coherence_fields() |> Enum.map(&String.to_atom(&1))
 
   def changeset(model, params \\ %{}) do
     model
@@ -194,7 +194,7 @@ defmodule TestCoherence.Coherence.Account do
     model
     |> cast(
       params,
-      ~w(password password_confirmation reset_password_token reset_password_sent_at)
+      ~w(password password_confirmation reset_password_token reset_password_sent_at)a
     )
     |> validate_coherence_password_reset(params)
   end
@@ -220,7 +220,7 @@ defmodule TestCoherence.Coherence.Rememberable do
 
   def changeset(model, params \\ %{}) do
     model
-    |> cast(params, ~w(series_hash token_hash token_created_at user_id))
+    |> cast(params, ~w(series_hash token_hash token_created_at user_id)a)
     |> validate_required(~w(series_hash token_hash token_created_at user_id)a)
   end