Remove unnecessary code

Author: mathieuprog

lib/html/form.ex

@@ -44,7 +44,6 @@ if Code.ensure_loaded?(Phoenix.HTML) && Code.ensure_loaded?(Phoenix.HTML.Form) d
               errors: errors,
               valid?: errors == []
           }
-          |> add_changes_for_nested_embeds(params, errors)
 
         %Phoenix.HTML.Form{
           source: changeset,
@@ -81,66 +80,5 @@ if Code.ensure_loaded?(Phoenix.HTML) && Code.ensure_loaded?(Phoenix.HTML.Form) d
     defp get_errors(%{action: nil}), do: []
     defp get_errors(%{action: :ignore}), do: []
     defp get_errors(%{errors: errors}), do: errors
-
-    defp add_changes_for_nested_embeds(changeset, params, _errors) when params == %{},
-      do: changeset
-
-    defp add_changes_for_nested_embeds(changeset, %{} = params, errors) do
-      embeds_fields_as_string =
-        changeset.data.__struct__.__schema__(:embeds)
-        |> Enum.map(&Atom.to_string(&1))
-
-      embeds_params =
-        Enum.filter(params, fn {key, _} -> Enum.member?(embeds_fields_as_string, key) end)
-        |> Enum.map(fn {key, value} -> {String.to_existing_atom(key), value} end)
-
-      do_add_changes_for_nested_embeds(changeset, embeds_params, errors)
-    end
-
-    defp do_add_changes_for_nested_embeds(changeset, [], _errors), do: changeset
-
-    defp do_add_changes_for_nested_embeds(
-           changeset,
-           [{embed_field, %{} = embed_params} | tail_params],
-           errors
-         ) do
-      embed_errors =
-        Enum.find(errors, fn {error_key, _} -> error_key == embed_field end)
-        |> case do
-          {_, {_, errors}} -> errors
-          _ -> []
-        end
-
-      embed_data =
-        Map.get(changeset.data, embed_field) ||
-          get_embed_struct(changeset, embed_field, embed_params)
-
-      embed_changeset =
-        %Ecto.Changeset{
-          data: embed_data,
-          action: changeset.action,
-          params: embed_params,
-          errors: embed_errors,
-          valid?: embed_errors == [],
-          changes: %{}
-        }
-        |> add_changes_for_nested_embeds(embed_params, embed_errors)
-
-      changeset = %{changeset | changes: Map.put(changeset.changes, embed_field, embed_changeset)}
-
-      do_add_changes_for_nested_embeds(changeset, tail_params, embed_errors)
-    end
-
-    defp do_add_changes_for_nested_embeds(changeset, [_ | tail_params], errors) do
-      do_add_changes_for_nested_embeds(changeset, tail_params, errors)
-    end
-
-    defp get_embed_struct(changeset, field, params) do
-      changeset
-      |> Ecto.Changeset.cast(%{field => params}, [])
-      |> Ecto.Changeset.cast_embed(field)
-      |> Ecto.Changeset.apply_changes()
-      |> Map.fetch!(field)
-    end
   end
 end

test/polymorphic_embed_test.exs

@@ -1209,7 +1209,7 @@ defmodule PolymorphicEmbedTest do
             __type__: "location",
             address: "hello",
             country: %{
-              name: ""
+              name: "A"
             }
           },
           %{
@@ -1269,7 +1269,7 @@ defmodule PolymorphicEmbedTest do
                 assert f.impl == Phoenix.HTML.FormData.Ecto.Changeset
 
                 if index == 0 do
-                  assert f.errors == [name: {"can't be blank", [validation: :required]}]
+                  assert f.errors == [name: {"should be at least %{count} character(s)", [count: 3, validation: :length, kind: :min, type: :string]}]
                 else
                   assert f.errors == []
                 end

test/support/models/not_polymorphic/country.ex

@@ -13,5 +13,6 @@ defmodule PolymorphicEmbed.Regular.Country do
     struct
     |> cast(params, ~w(name)a)
     |> validate_required(~w(name)a)
+    |> validate_length(:name, min: 3)
   end
 end

test/support/models/polymorphic/country.ex

@@ -13,5 +13,6 @@ defmodule PolymorphicEmbed.Country do
     struct
     |> cast(params, ~w(name)a)
     |> validate_required(~w(name)a)
+    |> validate_length(:name, min: 3)
   end
 end