Skip to content

list-aware build/3 for Association.Has #3

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
MarthinL wants to merge 1 commit into
base: composite_foreign_keys
Choose a base branch
from
Open

list-aware build/3 for Association.Has #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions lib/ecto/association.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ defmodule Ecto.Association.Has do
end

@impl true
def struct(module, name, opts) do
def struct(module, name, opts) do
queryable = Keyword.fetch!(opts, :queryable)
cardinality = Keyword.fetch!(opts, :cardinality)
related = Ecto.Association.related_from_query(queryable, name)
Expand Down Expand Up @@ -870,7 +870,14 @@ defmodule Ecto.Association.Has do
@impl true
def build(%{owner_key: owner_key, related_key: related_key} = refl, owner, attributes) do
data = refl |> build(owner) |> struct(attributes)
%{data | related_key => Map.get(owner, owner_key)}
if (is_list(owner_key) and is_list(related_key)) do
Enum.zip(owner_key, related_key)
|> Enum.reduce(data, fn {p_owner_key, p_related_key}, acc ->
%{acc | p_related_key => Map.get(owner, p_owner_key)}
end)
else
%{data | related_key => Map.get(owner, owner_key)}
end
end

@impl true
Expand Down Expand Up @@ -1418,13 +1425,13 @@ defmodule Ecto.Association.ManyToMany do
# We only need to join in the "join table". Preload and Ecto.assoc expressions can then filter
# by &1.join_owner_key in ^... to filter down to the associated entries in the related table.

dst_binding = if is_nil(query) do
dst_binding = if is_nil(query) do
1
else
Ecto.Query.Builder.count_binds(query)
end

query =
query =
from(q in (query || queryable))
|> Ecto.Association.join_on_keys(join_through, Keyword.keys(join_related_keys), Keyword.values(join_related_keys), dst_binding, 0)
|> where_keys(owner, 1, join_through_keys, values)
Expand Down