Skip to content

Add support for composite primary keys #138

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

Draft
gosseti wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Add support for composite primary keys #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b19b2fe
Update dataloader to support composite associations
gosseti Mar 20, 2022
4859a17
Tidy up get_join_keys/1
gosseti Mar 20, 2022
19ca17d
Clean up code formatting
gosseti Mar 20, 2022
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
167 changes: 143 additions & 24 deletions lib/dataloader/ecto.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,14 +752,17 @@ if Code.ensure_loaded?(Ecto) do
query,
:join_first
) do
[{owner_join_key, owner_key}, {related_join_key, related_key}] = assoc.join_keys
[{owner_join_key, owner_key}, {related_join_key, related_key}] = get_join_keys(assoc)

join_query =
query
|> join(:inner, [x], y in ^assoc.join_through,
on: field(x, ^related_key) == field(y, ^related_join_key)
)
|> where([..., x], field(x, ^owner_join_key) == field(parent_as(:parent), ^owner_key))
|> where(
[..., x],
field(x, ^owner_join_key) == field(parent_as(:parent), ^owner_key)
)

binds_count = Ecto.Query.Builder.count_binds(join_query)

Expand All @@ -773,14 +776,17 @@ if Code.ensure_loaded?(Ecto) do
query,
:join_last
) do
[{owner_join_key, owner_key}, {related_join_key, related_key}] = assoc.join_keys
[{owner_join_key, owner_key}, {related_join_key, related_key}] = get_join_keys(assoc)

join_query =
query
|> join(:inner, [..., x], y in ^assoc.join_through,
on: field(x, ^related_key) == field(y, ^related_join_key)
)
|> where([..., x], field(x, ^owner_join_key) == field(parent_as(:parent), ^owner_key))
|> where(
[..., x],
field(x, ^owner_join_key) == field(parent_as(:parent), ^owner_key)
)

binds_count = Ecto.Query.Builder.count_binds(join_query)

Expand All @@ -790,18 +796,71 @@ if Code.ensure_loaded?(Ecto) do
end

defp build_preload_lateral_query([assoc], query, :join_first) do
query
|> where([x], field(x, ^assoc.related_key) == field(parent_as(:parent), ^assoc.owner_key))
|> Ecto.Association.combine_assoc_query(assoc.where)
case assoc do
%{
related_key: [related_key_1, related_key_2],
owner_key: [owner_key_1, owner_key_2]
} ->
query
|> where(
[x],
field(x, ^related_key_1) == field(parent_as(:parent), ^owner_key_1) and
field(x, ^related_key_2) == field(parent_as(:parent), ^owner_key_2)
)
|> Ecto.Association.combine_assoc_query(assoc.where)

%{
related_key: [related_key],
owner_key: [owner_key]
} ->
query
|> where(
[x],
field(x, ^related_key) == field(parent_as(:parent), ^owner_key)
)
|> Ecto.Association.combine_assoc_query(assoc.where)

assoc ->
query
|> where(
[x],
field(x, ^assoc.related_key) == field(parent_as(:parent), ^assoc.owner_key)
)
|> Ecto.Association.combine_assoc_query(assoc.where)
end
end

defp build_preload_lateral_query([assoc], query, :join_last) do
join_query =
query
|> where(
[..., x],
field(x, ^assoc.related_key) == field(parent_as(:parent), ^assoc.owner_key)
)
case assoc do
%{
related_key: [related_key_1, related_key_2],
owner_key: [owner_key_1, owner_key_2]
} ->
query
|> where(
[..., x],
field(x, ^related_key_1) == field(parent_as(:parent), ^owner_key_1) and
field(x, ^related_key_2) == field(parent_as(:parent), ^owner_key_2)
)

%{
related_key: [related_key],
owner_key: [owner_key]
} ->
query
|> where(
[..., x],
field(x, ^related_key) == field(parent_as(:parent), ^owner_key)
)

assoc ->
query
|> where(
[..., x],
field(x, ^assoc.related_key) == field(parent_as(:parent), ^assoc.owner_key)
)
end

binds_count = Ecto.Query.Builder.count_binds(join_query)

Expand All @@ -814,7 +873,7 @@ if Code.ensure_loaded?(Ecto) do
query,
:join_first
) do
[{owner_join_key, owner_key}, {related_join_key, related_key}] = assoc.join_keys
[{owner_join_key, owner_key}, {related_join_key, related_key}] = get_join_keys(assoc)

join_query =
query
Expand All @@ -840,7 +899,7 @@ if Code.ensure_loaded?(Ecto) do
query,
:join_last
) do
[{owner_join_key, owner_key}, {related_join_key, related_key}] = assoc.join_keys
[{owner_join_key, owner_key}, {related_join_key, related_key}] = get_join_keys(assoc)

join_query =
query
Expand All @@ -867,11 +926,36 @@ if Code.ensure_loaded?(Ecto) do
:join_first
) do
query =
query
|> join(:inner, [x], y in ^assoc.owner,
on: field(x, ^assoc.related_key) == field(y, ^assoc.owner_key)
)
|> Ecto.Association.combine_joins_query(assoc.where, 0)
case assoc do
%{
related_key: [related_key_1, related_key_2],
owner_key: [owner_key_1, owner_key_2]
} ->
query
|> join(:inner, [x], y in ^assoc.owner,
on:
field(x, ^related_key_1) == field(y, ^owner_key_1) and
field(x, ^related_key_2) == field(y, ^owner_key_2)
)
|> Ecto.Association.combine_joins_query(assoc.where, 0)

%{
related_key: [related_key],
owner_key: [owner_key]
} ->
query
|> join(:inner, [x], y in ^assoc.owner,
on: field(x, ^related_key) == field(y, ^owner_key)
)
|> Ecto.Association.combine_joins_query(assoc.where, 0)

assoc ->
query
|> join(:inner, [x], y in ^assoc.owner,
on: field(x, ^assoc.related_key) == field(y, ^assoc.owner_key)
)
|> Ecto.Association.combine_joins_query(assoc.where, 0)
end

build_preload_lateral_query(rest, query, :join_last)
end
Expand All @@ -884,15 +968,50 @@ if Code.ensure_loaded?(Ecto) do
binds_count = Ecto.Query.Builder.count_binds(query)

join_query =
query
|> Ecto.Association.combine_joins_query(assoc.where, binds_count - 1)
|> join(:inner, [..., x], y in ^assoc.owner,
on: field(x, ^assoc.related_key) == field(y, ^assoc.owner_key)
)
case assoc do
%{
related_key: [related_key_1, related_key_2],
owner_key: [owner_key_1, owner_key_2]
} ->
query
|> Ecto.Association.combine_joins_query(assoc.where, binds_count - 1)
|> join(:inner, [..., x], y in ^assoc.owner,
on:
field(x, ^related_key_1) == field(y, ^owner_key_1) and
field(x, ^related_key_2) == field(y, ^owner_key_2)
)

%{
related_key: [related_key],
owner_key: [owner_key]
} ->
query
|> Ecto.Association.combine_joins_query(assoc.where, binds_count - 1)
|> join(:inner, [..., x], y in ^assoc.owner,
on: field(x, ^related_key) == field(y, ^owner_key)
)

assoc ->
query
|> Ecto.Association.combine_joins_query(assoc.where, binds_count - 1)
|> join(:inner, [..., x], y in ^assoc.owner,
on: field(x, ^assoc.related_key) == field(y, ^assoc.owner_key)
)
end

build_preload_lateral_query(rest, join_query, :join_last)
end

defp get_join_keys(%Ecto.Association.ManyToMany{join_keys: join_keys}) do
case join_keys do
[[{owner_join_key, owner_key}], [{related_join_key, related_key}]] ->
[{owner_join_key, owner_key}, {related_join_key, related_key}]

join_keys ->
join_keys
end
end

defp maybe_distinct(query, [%Ecto.Association.Has{}, %Ecto.Association.BelongsTo{} | _]) do
distinct(query, true)
end
Expand Down
6 changes: 5 additions & 1 deletion mix.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ defmodule Dataloader.Mixfile do
defp deps do
[
{:telemetry, "~> 1.0 or ~> 0.4"},
{:ecto, ">= 3.4.3 and < 4.0.0", optional: true},
# {:ecto, ">= 3.4.3 and < 4.0.0", optional: true},
{:ecto, "~> 3.7",
git: "https://github.com/soundmonster/ecto.git",
branch: "composite_foreign_keys",
override: true},
{:ecto_sql, "~> 3.0", optional: true, only: :test},
{:postgrex, "~> 0.14", only: :test, runtime: false},
{:dialyxir, "~> 1.0.0", only: [:dev, :test], runtime: false},
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
"dialyxir": {:hex, :dialyxir, "1.0.0", "6a1fa629f7881a9f5aaf3a78f094b2a51a0357c843871b8bc98824e7342d00a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "aeb06588145fac14ca08d8061a142d52753dbc2cf7f0d00fc1013f53f8654654"},
"earmark_parser": {:hex, :earmark_parser, "1.4.15", "b29e8e729f4aa4a00436580dcc2c9c5c51890613457c193cc8525c388ccb2f06", [:mix], [], "hexpm", "044523d6438ea19c1b8ec877ec221b008661d3c27e3b848f4c879f500421ca5c"},
"ecto": {:hex, :ecto, "3.7.0", "0b250b4aa5a9cdb80252802bd535c54c963e2d83f5bd179a57c093ed0779994b", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "3a212cecd544a6f3d00921bc3e7545070eb50b9a1454525323027bf07eba1165"},
"ecto": {:git, "https://github.com/soundmonster/ecto.git", "ae241a1acf9575f7bdd4a9badccd47c44ed5a798", [branch: "composite_foreign_keys"]},
"ecto_sql": {:hex, :ecto_sql, "3.7.0", "2fcaad4ab0c8d76a5afbef078162806adbe709c04160aca58400d5cbbe8eeac6", [:mix], [{:db_connection, "~> 2.2", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.7.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.4.0 or ~> 0.5.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:tds, "~> 2.1.1", [hex: :tds, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a26135dfa1d99bf87a928c464cfa25bba6535a4fe761eefa56077a4febc60f70"},
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
"ex_doc": {:hex, :ex_doc, "0.25.1", "4b736fa38dc76488a937e5ef2944f5474f3eff921de771b25371345a8dc810bc", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "3200b0a69ddb2028365281fbef3753ea9e728683863d8cdaa96580925c891f67"},
Expand Down
2 changes: 1 addition & 1 deletion test/support/picture.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ defmodule Dataloader.Picture do

schema "pictures" do
field(:status, :string)
field(:url, :string, null: false)
field(:url, :string)
has_many(:likes, Dataloader.Like)
has_many(:published_likes, Dataloader.Like, where: [status: "published"])
end
Expand Down