Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/ecto/changeset.ex
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ defmodule Ecto.Changeset do
end
end

defp relation_changed?(:one, nil), do: true

defp relation_changed?(:one, changeset) do
changeset.action != :update or changeset.changes != %{}
end
Expand Down
22 changes: 22 additions & 0 deletions test/ecto/changeset_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ defmodule Ecto.ChangesetTest do
belongs_to :category, Ecto.ChangesetTest.Category, references: :category_id, source: :cat_id
has_many :comments, Ecto.ChangesetTest.Comment, on_replace: :delete
has_one :comment, Ecto.ChangesetTest.Comment
has_one :deletable_comment, Ecto.ChangesetTest.Comment, on_replace: :delete
has_one :nilify_comment, Ecto.ChangesetTest.Comment, on_replace: :nilify
end
end

Expand Down Expand Up @@ -878,6 +880,26 @@ defmodule Ecto.ChangesetTest do
end
end

test "changed?/3 returns true when a cardinality-one association is removed" do
comment = %Comment{id: 1}

changeset =
%Post{deletable_comment: comment}
|> change()
|> put_assoc(:deletable_comment, nil)

assert changeset.changes.deletable_comment == nil
assert changed?(changeset, :deletable_comment)

changeset =
%Post{nilify_comment: comment}
|> cast(%{"nilify_comment" => nil}, [])
|> cast_assoc(:nilify_comment)

assert changeset.changes.nilify_comment == nil
assert changed?(changeset, :nilify_comment)
end

test "fetch_field/2" do
changeset = changeset(%Post{body: "bar"}, %{"title" => "foo"})

Expand Down
Loading