fix: fix match validation when performed atomically

ash-project · May 3, 2024 · 1bdc095 · 1bdc095
1 parent a3418e3
commit 1bdc095
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/ash/resource/validation/match.ex b/lib/ash/resource/validation/match.ex
@@ -75,6 +75,21 @@ defmodule Ash.Resource.Validation.Match do
         {:not_atomic, "can't match on an atomic expression"}
 
       true ->
+        changeset =
+          if Keyword.has_key?(changeset.atomics, opts[:attribute]) do
+            %{
+              changeset
+              | attributes:
+                  Map.put(
+                    changeset.attributes,
+                    opts[:attribute],
+                    changeset.atomics[opts[:attribute]]
+                  )
+            }
+          else
+            changeset
+          end
+
         validate(changeset, opts, context)
     end
   end

diff --git a/test/actions/bulk/bulk_update_test.exs b/test/actions/bulk/bulk_update_test.exs
@@ -374,9 +374,9 @@ defmodule Ash.Test.Actions.BulkUpdateTest do
     create_records = fn count ->
       Stream.iterate(1, &(&1 + 1))
       |> Stream.map(fn i -> %{title: "title#{i}"} end)
+      |> Stream.take(count)
       |> Ash.bulk_create!(Post, :create, return_stream?: true, return_records?: true)
       |> Stream.map(fn {:ok, result} -> result end)
-      |> Stream.take(count)
     end
 
     update_records = fn records, opts ->
@@ -459,7 +459,7 @@ defmodule Ash.Test.Actions.BulkUpdateTest do
                result
              end)
              |> Ash.bulk_update(:update_with_match, %{title4: "INVALID"},
-               strategy: :atomic_batches,
+               strategy: :atomic,
                resource: Post,
                return_errors?: true,
                authorize?: false