Skip to content

Commit 8b3f63a

Browse files
committed
Implements Enhancement elixir-ecto#3890
1 parent ac6c395 commit 8b3f63a

2 files changed

Lines changed: 54 additions & 13 deletions

File tree

‎lib/ecto/embedded.ex‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,8 @@ defmodule Ecto.Embedded do
283283
def build(%Embedded{related: related}, _owner) do
284284
related.__struct__
285285
end
286+
287+
def preload_info(_embed) do
288+
{:embed}
289+
end
286290
end

‎lib/ecto/repo/preloader.ex‎

Lines changed: 50 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ defmodule Ecto.Repo.Preloader do
6363
if sample = Enum.find(structs, & &1) do
6464
module = sample.__struct__
6565
prefix = preload_prefix(tuplet, sample)
66-
{assocs, throughs} = expand(module, preloads, {%{}, %{}})
66+
{assocs, throughs, embeds} = expand(module, preloads, {%{}, %{}, []})
67+
structs = preload_embeds(structs, embeds, repo_name, tuplet)
6768

6869
{fetched_assocs, to_fetch_queries} =
6970
prepare_queries(structs, module, assocs, prefix, repo_name, tuplet)
@@ -154,6 +155,21 @@ defmodule Ecto.Repo.Preloader do
154155

155156
defp preload_assocs([], [], _repo_name, _tuplet), do: []
156157

158+
defp preload_embeds(structs, embeds, repo_name, tuplet) do
159+
structs =
160+
Enum.reduce(structs, [], fn struct, acc ->
161+
struct =
162+
Enum.reduce(embeds, struct, fn {embed, sub_preloads}, struct_acc ->
163+
%{field: field} = embed
164+
embedded_schema = Map.get(struct, field)
165+
loaded_schema = preload_each(embedded_schema, repo_name, sub_preloads, tuplet)
166+
Map.put(struct_acc, field, loaded_schema)
167+
end)
168+
[struct | acc]
169+
end)
170+
Enum.reverse(structs)
171+
end
172+
157173
defp maybe_unpack_query(false, queries), do: {[], [], queries}
158174
defp maybe_unpack_query(true, [{ids, structs} | queries]), do: {ids, structs, queries}
159175

@@ -493,22 +509,30 @@ defmodule Ecto.Repo.Preloader do
493509
## Expand
494510

495511
def expand(schema, preloads, acc) do
496-
Enum.reduce(preloads, acc, fn {preload, {fields, query, sub_preloads}}, {assocs, throughs} ->
497-
assoc = association_from_schema!(schema, preload)
498-
info = assoc.__struct__.preload_info(assoc)
512+
Enum.reduce(preloads, acc, fn {preload, {fields, query, sub_preloads}},
513+
{assocs, throughs, embeds} ->
514+
assoc_or_embed = association_or_embed!(schema, preload)
515+
516+
info = assoc_or_embed.__struct__.preload_info(assoc_or_embed)
499517

500518
case info do
501519
{:assoc, _, _} ->
502-
value = {info, fields, query, sub_preloads}
520+
value = {info, fields, query, sub_preloads}
503521
assocs = Map.update(assocs, preload, value, &merge_preloads(preload, value, &1))
504-
{assocs, throughs}
522+
{assocs, throughs, embeds}
523+
505524
{:through, _, through} ->
506525
through =
507526
through
508527
|> Enum.reverse()
509528
|> Enum.reduce({fields, query, sub_preloads}, &{nil, nil, [{&1, &2}]})
510529
|> elem(2)
511-
expand(schema, through, {assocs, Map.put(throughs, preload, info)})
530+
531+
expand(schema, through, {assocs, Map.put(throughs, preload, info), embeds})
532+
533+
{:embed} ->
534+
embeds = [{assoc_or_embed, sub_preloads} | embeds]
535+
{assocs, throughs, embeds}
512536
end
513537
end)
514538
end
@@ -522,12 +546,25 @@ defmodule Ecto.Repo.Preloader do
522546
"with different queries: #{inspect left} and #{inspect right}"
523547
end
524548

525-
# Since there is some ambiguity between assoc and queries.
526-
# We reimplement this function here for nice error messages.
527-
defp association_from_schema!(schema, assoc) do
528-
schema.__schema__(:association, assoc) ||
529-
raise ArgumentError,
530-
"schema #{inspect schema} does not have association #{inspect assoc}#{maybe_module(assoc)}"
549+
defp association_or_embed!(schema, preload) do
550+
assoc_result = schema.__schema__(:association, preload)
551+
552+
case !!assoc_result do
553+
true ->
554+
assoc_result
555+
556+
false ->
557+
embed_result = schema.__schema__(:embed, preload)
558+
559+
case !!embed_result do
560+
true ->
561+
embed_result
562+
563+
false ->
564+
raise ArgumentError,
565+
"schema #{inspect(schema)} does not have association #{inspect(assoc_result)}#{maybe_module(assoc_result)}"
566+
end
567+
end
531568
end
532569

533570
defp maybe_module(assoc) do

0 commit comments

Comments
 (0)