mirror of
https://github.com/ash-project/ash.git
synced 2024-09-20 13:33:20 +12:00
fix: don't try to reselect fields when pkeys are missing
This commit is contained in:
parent
a31caaf08b
commit
35d45238c9
1 changed files with 4 additions and 5 deletions
|
@ -614,8 +614,9 @@ defmodule Ash.Actions.Read do
|
||||||
calculations_at_runtime ++ calculations_in_query
|
calculations_at_runtime ++ calculations_in_query
|
||||||
)
|
)
|
||||||
|
|
||||||
if Enum.empty?(must_be_reselected) && Enum.empty?(query.aggregates) &&
|
if missing_pkeys? ||
|
||||||
Enum.empty?(calculations_in_query) do
|
(Enum.empty?(must_be_reselected) && Enum.empty?(query.aggregates) &&
|
||||||
|
Enum.empty?(calculations_in_query)) do
|
||||||
{:ok, initial_data}
|
{:ok, initial_data}
|
||||||
else
|
else
|
||||||
reselect_and_load(
|
reselect_and_load(
|
||||||
|
@ -623,7 +624,6 @@ defmodule Ash.Actions.Read do
|
||||||
query,
|
query,
|
||||||
must_be_reselected,
|
must_be_reselected,
|
||||||
calculations_in_query,
|
calculations_in_query,
|
||||||
missing_pkeys?,
|
|
||||||
opts
|
opts
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
@ -634,7 +634,6 @@ defmodule Ash.Actions.Read do
|
||||||
query,
|
query,
|
||||||
must_be_reselected,
|
must_be_reselected,
|
||||||
calculations_in_query,
|
calculations_in_query,
|
||||||
missing_pkeys?,
|
|
||||||
opts
|
opts
|
||||||
) do
|
) do
|
||||||
primary_key = Ash.Resource.Info.primary_key(query.resource)
|
primary_key = Ash.Resource.Info.primary_key(query.resource)
|
||||||
|
@ -727,7 +726,7 @@ defmodule Ash.Actions.Read do
|
||||||
true
|
true
|
||||||
) do
|
) do
|
||||||
results
|
results
|
||||||
|> attach_fields(initial_data, query, missing_pkeys?)
|
|> attach_fields(initial_data, query, false)
|
||||||
|> compute_expression_at_runtime_for_missing_records(query, data_layer_calculations)
|
|> compute_expression_at_runtime_for_missing_records(query, data_layer_calculations)
|
||||||
|> case do
|
|> case do
|
||||||
{:ok, result} ->
|
{:ok, result} ->
|
||||||
|
|
Loading…
Reference in a new issue