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

fix: handle aggregate defaults when evaluating expressions

Browse source
This commit is contained in:
Zach Daniel 2023-01-05 13:15:51 -05:00
parent c28138cbce
commit 936dac8627
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ash/filter/runtime.ex
View file

@ -458,7 +458,11 @@ defmodule Ash.Filter.Runtime do
|> Enum.find_value(&Ash.Query.Function.try_cast_arguments(&1, args))
end
defp resolve_ref(_, nil, _), do: :unknown
defp resolve_ref(%Ash.Query.Ref{attribute: attribute}, nil, _),
do: :unknown |> or_default(attribute)
defp resolve_ref(_, nil, _),
do: :unknown
defp resolve_ref(
%Ash.Query.Ref{
@ -558,10 +562,30 @@ defmodule Ash.Filter.Runtime do
record ->
{:ok, Map.get(record, name)}
end
|> or_default(attribute)
end
defp resolve_ref(_value, _record, _), do: :unknown
defp or_default(:unknown, %Ash.Resource.Aggregate{default: default}) when not is_nil(default) do
if is_function(default) do
{:ok, default.()}
else
{:ok, default}
end
end
defp or_default({:ok, nil}, %Ash.Resource.Aggregate{default: default})
when not is_nil(default) do
if is_function(default) do
{:ok, default.()}
else
{:ok, default}
end
end
defp or_default(other, _), do: other
defp path_to_load([first]), do: {first, []}
defp path_to_load([first | rest]) do