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
12 changes: 7 additions & 5 deletions lib/ecto/changeset.ex
Original file line number Diff line number Diff line change
Expand Up @@ -4323,11 +4323,13 @@ defmodule Ecto.Changeset do

acc = Map.put(acc, key, relation_changed)

with %Ecto.Association.BelongsTo{related_key: related_key} <- relation,
%{^related_key => id} <- relation_changed do
Map.put(acc, relation.owner_key, id)
else
_ -> acc
case relation do
%Ecto.Association.BelongsTo{related_key: related_key, owner_key: owner_key} ->
id = relation_changed && Map.fetch!(relation_changed, related_key)
Map.put(acc, owner_key, id)

_ ->
acc
end
end

Expand Down
4 changes: 3 additions & 1 deletion test/ecto/changeset_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -1083,8 +1083,10 @@ defmodule Ecto.ChangesetTest do
assert changed_post.title == "foo"
assert changed_post.category_id == category.category_id

post_with_category = %Post{category_id: 5}

changeset =
post
post_with_category
|> changeset(%{"title" => "foo"})
|> put_assoc(:category, nil)

Expand Down
Loading