improvement: add backwards compatibility for data layers returning only index metadata

Author: DGollings

lib/ash/actions/create/bulk.ex

@@ -1455,7 +1455,8 @@ defmodule Ash.Actions.Create.Bulk do
     |> Ash.Actions.Update.Bulk.run_bulk_after_changes(
       all_changes,
       results,
-      changesets_by_index,
+      changesets_by_index,  # This acts as changesets_by_ref for create
+      nil,                   # No index->ref mapping needed for create
       changesets,
       opts,
       ref,

lib/ash/actions/destroy/bulk.ex

@@ -2170,7 +2170,8 @@ defmodule Ash.Actions.Destroy.Bulk do
     |> Ash.Actions.Update.Bulk.run_bulk_after_changes(
       all_changes,
       batch,
-      changesets_by_index,
+      changesets_by_index,  # This acts as changesets_by_ref for destroy
+      nil,                   # No index->ref mapping needed for destroy
       changesets,
       opts,
       ref,

lib/ash/actions/update/bulk.ex

@@ -2147,13 +2147,15 @@ defmodule Ash.Actions.Update.Bulk do
     end
   end
 
-  defp index_changesets_by_ref(batch, context_key) do
-    Enum.reduce(batch, %{}, fn changeset, changesets_by_ref ->
-      Map.put(
-        changesets_by_ref,
-        changeset.context[context_key].ref,
-        changeset
-      )
+  defp index_changesets(batch, context_key) do
+    Enum.reduce(batch, {%{}, %{}}, fn changeset, {by_ref, by_index} ->
+      ref = changeset.context[context_key].ref
+      index = changeset.context[context_key].index
+
+      {
+        Map.put(by_ref, ref, changeset),
+        Map.put(by_index, index, ref)
+      }
     end)
   end
 
@@ -2529,7 +2531,7 @@ defmodule Ash.Actions.Update.Bulk do
         end
       end)
 
-    changesets_by_ref = index_changesets_by_ref(batch, context_key)
+    {changesets_by_ref, changesets_by_index} = index_changesets(batch, context_key)
 
     batch =
       batch
@@ -2686,7 +2688,7 @@ defmodule Ash.Actions.Update.Bulk do
           end)
       end
 
-    {batch, changesets_by_ref}
+    {batch, changesets_by_ref, changesets_by_index}
   end
 
   defp manage_relationships(updated, domain, changeset, engine_opts) do
@@ -2704,7 +2706,7 @@ defmodule Ash.Actions.Update.Bulk do
   end
 
   defp run_after_action_hooks(
-         {batch_results, changesets_by_ref},
+         {batch_results, changesets_by_ref, changesets_by_index},
          opts,
          domain,
          ref,
@@ -2759,11 +2761,11 @@ defmodule Ash.Actions.Update.Bulk do
         end
       end)
 
-    {results, changesets_by_ref}
+    {results, changesets_by_ref, changesets_by_index}
   end
 
   defp process_results(
-         {batch, changesets_by_ref},
+         {batch, changesets_by_ref, changesets_by_index},
          changes,
          all_changes,
          opts,
@@ -2780,6 +2782,7 @@ defmodule Ash.Actions.Update.Bulk do
       all_changes,
       batch,
       changesets_by_ref,
+      changesets_by_index,
       changesets,
       opts,
       ref,
@@ -2872,6 +2875,7 @@ defmodule Ash.Actions.Update.Bulk do
         all_changes,
         results,
         changesets_by_ref,
+        changesets_by_index,
         changesets,
         opts,
         ref,
@@ -2964,6 +2968,7 @@ defmodule Ash.Actions.Update.Bulk do
                   result,
                   changes[index],
                   changesets_by_ref,
+                  changesets_by_index,
                   metadata_key,
                   ref_metadata_key
                 )
@@ -3573,17 +3578,39 @@ defmodule Ash.Actions.Update.Bulk do
     changeset
   end
 
-  defp result_matches_changes?(result, changes, changesets_by_ref, metadata_key, ref_metadata_key) do
-    if ref_metadata_key do
+  defp result_matches_changes?(result, changes, changesets_by_ref, changesets_by_index, metadata_key, ref_metadata_key) do
+    # For create/destroy operations, changesets_by_index may be nil and we use direct index matching
+    if is_nil(changesets_by_index) do
+      # Legacy behavior for create/destroy: direct index-based matching
+      result.__metadata__[metadata_key] in List.wrap(changes)
+    else
+      # New behavior for update operations: try ref first, then fallback to index->ref mapping
       ref_key = result.__metadata__[ref_metadata_key]
 
-      changesets_by_ref
-      |> Map.get(ref_key)
-      |> ensure_changeset!(result, metadata_key, ref_metadata_key)
+      ref_key =
+        if ref_key do
+          ref_key
+        else
+          # Fallback: get ref from index mapping for backwards compatibility
+          index = result.__metadata__[metadata_key]
 
-      ref_key in List.wrap(changes)
-    else
-      result.__metadata__[metadata_key] in List.wrap(changes)
+          if index do
+            changesets_by_index[index]
+          else
+            nil
+          end
+        end
+
+      if ref_key do
+        changesets_by_ref
+        |> Map.get(ref_key)
+        |> ensure_changeset!(result, metadata_key, ref_metadata_key)
+
+        ref_key in List.wrap(changes)
+      else
+        # Final fallback to index-based matching if no ref available
+        result.__metadata__[metadata_key] in List.wrap(changes)
+      end
     end
   end
 

lib/ash/data_layer/ets/ets.ex

@@ -1880,15 +1880,23 @@ defmodule Ash.DataLayer.Ets do
             {:ok, result} ->
               result =
                 if result_changeset.context[:bulk_update] do
-                  result
-                  |> Ash.Resource.put_metadata(
-                    :bulk_update_index,
-                    result_changeset.context.bulk_update.index
-                  )
-                  |> Ash.Resource.put_metadata(
-                    :bulk_action_ref,
-                    result_changeset.context.bulk_update.ref
-                  )
+                  result =
+                    result
+                    |> Ash.Resource.put_metadata(
+                      :bulk_update_index,
+                      result_changeset.context.bulk_update.index
+                    )
+
+                  # For testing backwards compatibility, allow skipping ref metadata
+                  if Application.get_env(:ash, :test_bulk_index_only, false) do
+                    result
+                  else
+                    Ash.Resource.put_metadata(
+                      result,
+                      :bulk_action_ref,
+                      result_changeset.context.bulk_update.ref
+                    )
+                  end
                 else
                   result
                 end