From 28136ec43f0728b20197ae1f7a4ddefd31522794 Mon Sep 17 00:00:00 2001 From: Zach Daniel Date: Wed, 17 Apr 2024 15:08:29 +0100 Subject: [PATCH] chore: format --- lib/ash/actions/update/bulk.ex | 1 - lib/ash/changeset/changeset.ex | 60 ++++++++++++++++++---------------- lib/ash/filter/filter.ex | 2 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/lib/ash/actions/update/bulk.ex b/lib/ash/actions/update/bulk.ex index 38cd212d3..59333b9e8 100644 --- a/lib/ash/actions/update/bulk.ex +++ b/lib/ash/actions/update/bulk.ex @@ -339,7 +339,6 @@ defmodule Ash.Actions.Update.Bulk do authorize_atomic_changeset(query, atomic_changeset, opts), {query, atomic_changeset} <- add_changeset_filters(query, atomic_changeset), {:ok, data_layer_query} <- Ash.Query.data_layer_query(query) do - case Ash.DataLayer.update_query( data_layer_query, atomic_changeset, diff --git a/lib/ash/changeset/changeset.ex b/lib/ash/changeset/changeset.ex index 413108735..23525a33d 100644 --- a/lib/ash/changeset/changeset.ex +++ b/lib/ash/changeset/changeset.ex @@ -2109,43 +2109,45 @@ defmodule Ash.Changeset do Enum.reduce( changeset.atomics, changeset, - fn {_key, - %Ash.Query.Function.Error{ - arguments: arguments - } = error}, changeset -> - Enum.reduce_while(arguments, {:ok, []}, fn argument, {:ok, args} -> - case Ash.Expr.eval(argument, - resource: changeset.resource, - unknown_on_unknown_refs?: true - ) do - {:ok, value} -> - {:cont, {:ok, [value | args]}} - - _ -> - {:halt, :error} - end - end) - |> case do - {:ok, args} -> - error = %{error | arguments: args} - - case Ash.Expr.eval(error, + fn + {_key, + %Ash.Query.Function.Error{ + arguments: arguments + } = error}, + changeset -> + Enum.reduce_while(arguments, {:ok, []}, fn argument, {:ok, args} -> + case Ash.Expr.eval(argument, resource: changeset.resource, unknown_on_unknown_refs?: true ) do - {:error, error} -> - Ash.Changeset.add_error(changeset, error) + {:ok, value} -> + {:cont, {:ok, [value | args]}} _ -> - changeset + {:halt, :error} end + end) + |> case do + {:ok, args} -> + error = %{error | arguments: args} - _ -> - changeset - end + case Ash.Expr.eval(error, + resource: changeset.resource, + unknown_on_unknown_refs?: true + ) do + {:error, error} -> + Ash.Changeset.add_error(changeset, error) - {_key, _value}, changeset -> - changeset + _ -> + changeset + end + + _ -> + changeset + end + + {_key, _value}, changeset -> + changeset end ) else diff --git a/lib/ash/filter/filter.ex b/lib/ash/filter/filter.ex index 30b7668a7..b035673bc 100644 --- a/lib/ash/filter/filter.ex +++ b/lib/ash/filter/filter.ex @@ -3509,7 +3509,7 @@ defmodule Ash.Filter do end {:ok, right} -> - {:ok, %{expr | left: left, right: right}} + {:ok, %{expr | left: left, right: right}} end end end