ash-project/ash
1
0
Fork 0
mirror of https://github.com/ash-project/ash.git synced 2024-09-20 21:43:02 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix: pass actor opt down

Browse source
This commit is contained in:
Zach Daniel 2022-07-22 00:59:34 -04:00
parent 347907029b
commit 026ac43493
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ash/actions/load.ex
View file

@ -853,7 +853,7 @@ defmodule Ash.Actions.Load do
|> Ash.Query.do_filter(relationship.filter) |> Ash.Query.do_filter(relationship.filter)
|> Ash.Query.sort(relationship.sort) |> Ash.Query.sort(relationship.sort)
|> remove_relationships_from_load() |> remove_relationships_from_load()
|> read(relationship.read_action) |> read(relationship.read_action, request_opts)
lateral_join?(query, relationship, source_data) && (limit || offset) -> lateral_join?(query, relationship, source_data) && (limit || offset) ->
query query
@ -871,10 +871,10 @@ defmodule Ash.Actions.Load do
|> Ash.Query.do_filter(relationship.filter) |> Ash.Query.do_filter(relationship.filter)
|> Ash.Query.sort(relationship.sort) |> Ash.Query.sort(relationship.sort)
|> remove_relationships_from_load() |> remove_relationships_from_load()
|> read(relationship.read_action) |> read(relationship.read_action, request_opts)
limit || offset -> limit || offset ->
artificial_limit_and_offset(query, limit, offset, relationship) artificial_limit_and_offset(query, limit, offset, relationship, request_opts)
true -> true ->
query query
@ -882,7 +882,7 @@ defmodule Ash.Actions.Load do
|> Ash.Query.do_filter(relationship.filter) |> Ash.Query.do_filter(relationship.filter)
|> Ash.Query.sort(relationship.sort) |> Ash.Query.sort(relationship.sort)
|> remove_relationships_from_load() |> remove_relationships_from_load()
|> read(relationship.read_action) |> read(relationship.read_action, request_opts)
end end
end end
) )
@ -896,13 +896,13 @@ defmodule Ash.Actions.Load do
end end
end end
defp artificial_limit_and_offset(query, limit, offset, relationship) do defp artificial_limit_and_offset(query, limit, offset, relationship, request_opts) do
query query
|> Ash.Query.set_context(relationship.context) |> Ash.Query.set_context(relationship.context)
|> Ash.Query.do_filter(relationship.filter) |> Ash.Query.do_filter(relationship.filter)
|> Ash.Query.sort(relationship.sort) |> Ash.Query.sort(relationship.sort)
|> remove_relationships_from_load() |> remove_relationships_from_load()
|> read(relationship.read_action) |> read(relationship.read_action, request_opts)
|> case do |> case do
{:ok, results} -> {:ok, results} ->
new_results = new_results =
@ -927,12 +927,12 @@ defmodule Ash.Actions.Load do
end end
end end
defp read(query, action) do defp read(query, action, request_opts) do
action = action || primary_read(query) action = action || primary_read(query)
query query
|> load_for_calcs() |> load_for_calcs()
|> Ash.Actions.Read.unpaginated_read(action) |> Ash.Actions.Read.unpaginated_read(action, request_opts)
end end
defp load_for_calcs(query) do defp load_for_calcs(query) do