Do not assume all arguments in empty? are changesets

Closes #2178
elixir-ecto · Aug 23, 2017 · f8f3c1f · f8f3c1f
1 parent 4f84ddf
commit f8f3c1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/ecto/changeset/relation.ex b/lib/ecto/changeset/relation.ex
@@ -29,7 +29,12 @@ defmodule Ecto.Changeset.Relation do
   """
   def empty?(%{cardinality: _}, %NotLoaded{}), do: true
   def empty?(%{cardinality: :many}, []), do: true
-  def empty?(%{cardinality: :many}, changes), do: Enum.all?(changes, & &1.action in [:replace, :delete])
+  def empty?(%{cardinality: :many}, changes) do
+    Enum.all?(changes, fn
+      %Changeset{action: action} when action in [:replace, :delete] -> true
+      _ -> false
+    end)
+  end
   def empty?(%{cardinality: :one}, nil), do: true
   def empty?(%{}, _), do: false
 

diff --git a/test/ecto/changeset/has_assoc_test.exs b/test/ecto/changeset/has_assoc_test.exs
@@ -476,6 +476,11 @@ defmodule Ecto.Changeset.HasAssocTest do
     assert changeset.changes == %{}
     assert changeset.errors == [posts: {"can't be blank", [validation: :required]}]
 
+    changeset = cast(%Author{posts: [%Post{title: "hello", id: 1}]}, %{}, :posts, required: true)
+    assert changeset.required == [:posts]
+    assert changeset.changes == %{}
+    assert changeset.errors == []
+
     changeset = cast(%Author{posts: []}, %{"posts" => nil}, :posts, required: true)
     assert changeset.required == [:posts]
     assert changeset.changes == %{}