wip

Author: DGollings

lib/ash/actions/create/bulk.ex

@@ -1460,8 +1460,7 @@ defmodule Ash.Actions.Create.Bulk do
       opts,
       ref,
       resource,
-      :bulk_create_index,
-      :bulk_action_ref
+      :bulk_create_index
     )
     |> then(fn records ->
       if opts[:return_records?] do

lib/ash/actions/destroy/bulk.ex

@@ -2175,8 +2175,7 @@ defmodule Ash.Actions.Destroy.Bulk do
       opts,
       ref,
       resource,
-      :bulk_destroy_index,
-      :bulk_action_ref
+      :bulk_destroy_index
     )
     |> Enum.flat_map(fn result ->
       changeset = changesets_by_index[result.__metadata__[:bulk_destroy_index]]

lib/ash/actions/update/bulk.ex

@@ -2847,7 +2847,7 @@ defmodule Ash.Actions.Update.Bulk do
         ref,
         resource,
         metadata_key,
-        ref_metadata_key
+        ref_metadata_key \\ nil
       ) do
     source_context =
       case changesets do
@@ -3537,10 +3537,18 @@ defmodule Ash.Actions.Update.Bulk do
     end)
   end
 
-  defp find_changeset(result, changesets_by_ref, _metadata_key, ref_metadata_key) do
+  defp find_changeset_by_index(result, changesets_by_ref, metadata_key) do
+    changesets_by_ref[result.__metadata__[metadata_key]]
+  end
+
+  defp find_changeset(result, changesets_by_ref, _metadata_key, ref_metadata_key) when not is_nil(ref_metadata_key) do
     find_changeset_by_ref(result, changesets_by_ref, ref_metadata_key)
   end
 
+  defp find_changeset(result, changesets_by_ref, metadata_key, nil) do
+    find_changeset_by_index(result, changesets_by_ref, metadata_key)
+  end
+
   defp ensure_changeset!(changeset, result, metadata_key, ref_metadata_key) do
     if changeset do
       changeset
@@ -3550,17 +3558,15 @@ defmodule Ash.Actions.Update.Bulk do
     end
   end
 
-  defp format_metadata_info(result, _metadata_key, ref_metadata_key) do
+  defp format_metadata_info(result, _metadata_key, ref_metadata_key) when not is_nil(ref_metadata_key) do
     "ref #{inspect(result.__metadata__[ref_metadata_key])}"
   end
 
-  defp result_matches_changes?(
-         result,
-         changes,
-         changesets_by_ref,
-         _metadata_key,
-         ref_metadata_key
-       ) do
+  defp format_metadata_info(result, metadata_key, nil) do
+    "index #{inspect(result.__metadata__[metadata_key])}"
+  end
+
+  defp result_matches_changes?(result, changes, changesets_by_ref, _metadata_key, ref_metadata_key) when not is_nil(ref_metadata_key) do
     ref_key = result.__metadata__[ref_metadata_key]
 
     if ref_key do
@@ -3573,4 +3579,8 @@ defmodule Ash.Actions.Update.Bulk do
       end)
     end
   end
+
+  defp result_matches_changes?(result, changes, _changesets_by_ref, metadata_key, nil) do
+    result.__metadata__[metadata_key] in List.wrap(changes)
+  end
 end