Revert "Ensure type is fetched for field in validate inclusion, subset, and exclusion (#3742)"

This reverts commit 32afd9e.

Also reverts commit c8d86c2, manually.

Author: v0idpwn

lib/ecto/changeset.ex

@@ -2008,10 +2008,7 @@ defmodule Ecto.Changeset do
   @spec validate_inclusion(t, atom, Enum.t, Keyword.t) :: t
   def validate_inclusion(changeset, field, data, opts \\ []) do
     validate_change changeset, field, {:inclusion, data}, fn _, value ->
-      type =
-        changeset.types
-        |> Map.fetch!(field)
-        |> Ecto.Type.type()
+      type = Map.fetch!(changeset.types, field)
 
       if Ecto.Type.include?(type, value, data),
         do: [],
@@ -2039,10 +2036,7 @@ defmodule Ecto.Changeset do
   @spec validate_subset(t, atom, Enum.t, Keyword.t) :: t
   def validate_subset(changeset, field, data, opts \\ []) do
     validate_change changeset, field, {:subset, data}, fn _, value ->
-      {:array, element_type} =
-        changeset.types
-        |> Map.fetch!(field)
-        |> Ecto.Type.type()
+      {:array, element_type} = Map.fetch!(changeset.types, field)
 
       case Enum.any?(value, fn element -> not Ecto.Type.include?(element_type, element, data) end) do
         true -> [{field, {message(opts, "has an invalid entry"), [validation: :subset, enum: data]}}]
@@ -2066,10 +2060,7 @@ defmodule Ecto.Changeset do
   @spec validate_exclusion(t, atom, Enum.t, Keyword.t) :: t
   def validate_exclusion(changeset, field, data, opts \\ []) do
     validate_change changeset, field, {:exclusion, data}, fn _, value ->
-      type =
-        changeset.types
-        |> Map.fetch!(field)
-        |> Ecto.Type.type()
+      type = Map.fetch!(changeset.types, field)
 
       if Ecto.Type.include?(type, value, data), do:
         [{field, {message(opts, "is reserved"), [validation: :exclusion, enum: data]}}], else: []

test/ecto/changeset_test.exs

@@ -36,27 +36,6 @@ defmodule Ecto.ChangesetTest do
     end
   end
 
-  defmodule CustomSlug do
-    use Ecto.Type
-
-    def type, do: :string
-    def cast(val), do: {:ok, val}
-    def load(val), do: {:ok, val}
-    def dump(val), do: {:ok, val}
-  end
-
-  defmodule CustomTag do
-    use Ecto.Type
-
-    def type, do: {:array, :string}
-    def cast(val) when is_list(val), do: {:ok, val}
-    def cast(_), do: :error
-    def load(val) when is_list(val), do: {:ok, val}
-    def load(_), do: :error
-    def dump(val) when is_list(val), do: {:ok, val}
-    def dump(_), do: :error
-  end
-
   defmodule Email do
     use Ecto.Type
 
@@ -88,14 +67,12 @@ defmodule Ecto.ChangesetTest do
       field :token, :integer, primary_key: true
       field :title, :string, default: ""
       field :author_email, Email
-      field :slug, CustomSlug
       field :body
       field :uuid, :binary_id
       field :color, :binary
       field :decimal, :decimal
       field :upvotes, :integer, default: 0
       field :topics, {:array, :string}
-      field :tags, CustomTag
       field :virtual, :string, virtual: true
       field :published_at, :naive_datetime
       field :source, :map
@@ -120,7 +97,7 @@ defmodule Ecto.ChangesetTest do
   end
 
   defp changeset(schema \\ %Post{}, params) do
-    cast(schema, params, ~w(id token title author_email slug body upvotes decimal color topics tags virtual)a)
+    cast(schema, params, ~w(id token title author_email body upvotes decimal color topics virtual)a)
   end
 
   defmodule CustomError do
@@ -1073,15 +1050,7 @@ defmodule Ecto.ChangesetTest do
     assert changeset.valid?
   end
 
-  test "validate_inclusion/3 with custom type" do
-    changeset =
-      changeset(%{"slug" => "foo"})
-      |> validate_inclusion(:slug, ~w(foo))
-    assert changeset.valid?
-    assert changeset.errors == []
-    assert validations(changeset) == [slug: {:inclusion, ~w(foo)}]
-
-    # type with custom equal function
+  test "validate_inclusion/3 with custom type and custom equal function" do
     changeset =
       changeset(%{"author_email" => "[email protected]"})
       |> validate_inclusion(:author_email, ["[email protected]"])
@@ -1121,16 +1090,6 @@ defmodule Ecto.ChangesetTest do
     assert changeset.valid?
   end
 
-  test "validate_subset/3 with custom type" do
-    changeset =
-      changeset(%{"tags" => ["cute", "animals"]})
-      |> validate_subset(:tags, ~w(cute animals))
-
-    assert changeset.valid?
-    assert changeset.errors == []
-    assert validations(changeset) == [tags: {:subset, ~w(cute animals)}]
-  end
-
   test "validate_exclusion/3" do
     changeset =
       changeset(%{"title" => "world"})
@@ -1161,15 +1120,6 @@ defmodule Ecto.ChangesetTest do
     assert changeset.errors ==  [value: {"is reserved", [validation: :exclusion, enum: decimals]}]
   end
 
-  test "validate_exclusion/3 with custom type" do
-    changeset =
-      changeset(%{"slug" => "sun"})
-      |> validate_exclusion(:slug, ~w(moon))
-    assert changeset.valid?
-    assert changeset.errors == []
-    assert validations(changeset) == [slug: {:exclusion, ~w(moon)}]
-  end
-
   test "validate_length/3 with string" do
     changeset = changeset(%{"title" => "world"}) |> validate_length(:title, min: 3, max: 7)
     assert changeset.valid?