fix: check if in transaction before trying to roll it back

ash-project · May 29, 2024 · 2a304a5 · 2a304a5
1 parent 1c21e39
commit 2a304a5
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/lib/ash/actions/create/bulk.ex b/lib/ash/actions/create/bulk.ex
@@ -1198,10 +1198,12 @@ defmodule Ash.Actions.Create.Bulk do
           case Ash.Changeset.run_after_actions(result, changeset, []) do
             {:error, error} ->
               if opts[:transaction] && opts[:rollback_on_error?] do
-                Ash.DataLayer.rollback(
-                  changeset.resource,
-                  error
-                )
+                if Ash.DataLayer.in_transaction?(changeset.resource) do
+                  Ash.DataLayer.rollback(
+                    changeset.resource,
+                    error
+                  )
+                end
               end
 
               store_error(ref, error, opts)
@@ -1419,10 +1421,12 @@ defmodule Ash.Actions.Create.Bulk do
 
         {:error, error} ->
           if opts[:transaction] && opts[:rollback_on_error?] do
-            Ash.DataLayer.rollback(
-              resource,
-              error
-            )
+            if Ash.DataLayer.in_transaction?(resource) do
+              Ash.DataLayer.rollback(
+                resource,
+                error
+              )
+            end
           end
 
           store_error(ref, error, opts)

diff --git a/lib/ash/actions/destroy/bulk.ex b/lib/ash/actions/destroy/bulk.ex
@@ -1820,10 +1820,12 @@ defmodule Ash.Actions.Destroy.Bulk do
           case Ash.Changeset.run_after_actions(result, changeset, []) do
             {:error, error} ->
               if opts[:transaction] && opts[:rollback_on_error?] do
-                Ash.DataLayer.rollback(
-                  changeset.resource,
-                  error
-                )
+                if Ash.DataLayer.in_transaction?(changeset.resource) do
+                  Ash.DataLayer.rollback(
+                    changeset.resource,
+                    error
+                  )
+                end
               end
 
               store_error(ref, error, opts)
@@ -2030,10 +2032,12 @@ defmodule Ash.Actions.Destroy.Bulk do
 
         {:error, error} ->
           if opts[:transaction] && opts[:rollback_on_error?] do
-            Ash.DataLayer.rollback(
-              resource,
-              error
-            )
+            if Ash.DataLayer.in_transaction?(resource) do
+              Ash.DataLayer.rollback(
+                resource,
+                error
+              )
+            end
           end
 
           store_error(ref, error, opts)

diff --git a/lib/ash/actions/update/bulk.ex b/lib/ash/actions/update/bulk.ex
@@ -2122,10 +2122,12 @@ defmodule Ash.Actions.Update.Bulk do
             case Ash.Changeset.run_after_actions(result, changeset, []) do
               {:error, error} ->
                 if opts[:transaction] && opts[:rollback_on_error?] do
-                  Ash.DataLayer.rollback(
-                    changeset.resource,
-                    error
-                  )
+                  if Ash.DataLayer.in_transaction?(changeset.resource) do
+                    Ash.DataLayer.rollback(
+                      changeset.resource,
+                      error
+                    )
+                  end
                 end
 
                 store_error(ref, error, opts)
@@ -2342,10 +2344,12 @@ defmodule Ash.Actions.Update.Bulk do
 
         {:error, error} ->
           if opts[:transaction] && opts[:rollback_on_error?] do
-            Ash.DataLayer.rollback(
-              resource,
-              error
-            )
+            if Ash.DataLayer.in_transaction?(resource) do
+              Ash.DataLayer.rollback(
+                resource,
+                error
+              )
+            end
           end
 
           store_error(ref, error, opts)