Skip to content

Allow loader/dumper be passed through Ecto.embedded_load / Ecto.embedded_dump #4782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LostKobrakai wants to merge 2 commits into
base: master
Choose a base branch
from
+30 −14
Open

Allow loader/dumper be passed through Ecto.embedded_load / Ecto.embedded_dump #4782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e136e0
Allow loader/dumper be passed through Ecto.embedded_load / Ecto.embed…
LostKobrakai Aug 13, 2026
0bacb53
Extend testsuite for new allowed input
LostKobrakai Aug 15, 2026
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
31 changes: 17 additions & 14 deletions lib/ecto.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,14 +723,14 @@ defmodule Ecto do
@spec embedded_load(
module_or_map :: module | map(),
data :: map(),
format :: atom()
format :: atom() | (Ecto.Type.t(), term -> {:ok, term} | :error)
) :: Ecto.Schema.t() | map()
def embedded_load(schema_or_types, data, format) do
Ecto.Schema.Loader.unsafe_load(
schema_or_types,
data,
&Ecto.Type.embedded_load(&1, &2, format)
)
def embedded_load(schema_or_types, data, format) when is_atom(format) do
embedded_load(schema_or_types, data, &Ecto.Type.embedded_load(&1, &2, format))
end

def embedded_load(schema_or_types, data, loader) when is_function(loader, 2) do
Ecto.Schema.Loader.unsafe_load(schema_or_types, data, loader)
end

@doc """
Expand All @@ -743,12 +743,15 @@ defmodule Ecto do
%{title: "hello"}

"""
@spec embedded_dump(Ecto.Schema.t(), format :: atom()) :: map()
def embedded_dump(%schema{} = data, format) do
Ecto.Schema.Loader.safe_dump(
data,
schema.__schema__(:dump),
&Ecto.Type.embedded_dump(&1, &2, format)
)
@spec embedded_dump(
Ecto.Schema.t(),
format :: atom() | (Ecto.Type.t(), term -> {:ok, term} | :error)
) :: map()
def embedded_dump(data, format) when is_atom(format) do
embedded_dump(data, &Ecto.Type.embedded_dump(&1, &2, format))
end

def embedded_dump(%schema{} = data, dumper) when is_function(dumper, 2) do
Ecto.Schema.Loader.safe_dump(data, schema.__schema__(:dump), dumper)
end
end
13 changes: 13 additions & 0 deletions test/ecto/embedded_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ defmodule Ecto.EmbeddedTest do
assert %Settings{dark_mode: false, default_post: nil} =
Ecto.embedded_load(Settings, %{"default_post" => nil}, :json)

assert %Settings{dark_mode: false, default_post: nil} =
Ecto.embedded_load(
Settings,
%{"default_post" => nil},
&Ecto.Type.embedded_load(&1, &2, :json)
)

assert_raise ArgumentError,
~s[cannot load `"ABC"` as type Ecto.UUID for field `uuid` in schema Ecto.EmbeddedTest.UUIDSchema],
fn ->
Expand All @@ -100,6 +107,12 @@ defmodule Ecto.EmbeddedTest do
assert [author1 | _] = dumped.authors
assert not Map.has_key?(author1, :__struct__)
assert not Map.has_key?(author1, :__meta__)

assert %{uuid: ^uuid} =
Ecto.embedded_dump(
%UUIDSchema{uuid: uuid},
&Ecto.Type.embedded_dump(&1, &2, :json)
)
end

test "embedded schemas are not queryable" do
Expand Down
Loading