Use direct adapter rollback

Author: josevalim

lib/ecto/repo/transaction.ex

@@ -2,20 +2,8 @@ defmodule Ecto.Repo.Transaction do
   @moduledoc false
   @dialyzer :no_opaque
 
-  def transact(repo, _name, fun, {adapter_meta, opts}) when is_function(fun, 0) do
-    adapter_meta.adapter.transaction(adapter_meta, opts, fn ->
-      case fun.() do
-        {:ok, result} ->
-          result
-
-        {:error, reason} ->
-          rollback(repo, reason)
-
-        other ->
-          raise ArgumentError,
-                "expected to return {:ok, _} or {:error, _}, got: #{inspect(other)}"
-      end
-    end)
+  def transact(repo, name, fun, adapter_opts) when is_function(fun, 0) do
+    transact(repo, name, fn _repo -> fun.() end, adapter_opts)
   end
 
   def transact(repo, _name, fun, {adapter_meta, opts}) when is_function(fun, 1) do
@@ -25,7 +13,7 @@ defmodule Ecto.Repo.Transaction do
           result
 
         {:error, reason} ->
-          rollback(repo, reason)
+          adapter_meta.adapter.rollback(adapter_meta, reason)
 
         other ->
           raise ArgumentError,
@@ -48,7 +36,7 @@ defmodule Ecto.Repo.Transaction do
 
       {:error, operation} ->
         raise """
-        operation #{inspect operation} is rolling back unexpectedly.
+        operation #{inspect(operation)} is rolling back unexpectedly.
 
         This can happen if `repo.rollback/1` is manually called, which is not \
         supported by `Ecto.Multi`. It can also occur if a nested transaction \

test/ecto/repo_test.exs

@@ -182,7 +182,7 @@ defmodule Ecto.RepoTest do
   end
 
   defmodule MySchemaOneField do
-     use Ecto.Schema
+    use Ecto.Schema
 
     @primary_key false
     schema "my_schema" do
@@ -2148,8 +2148,8 @@ defmodule Ecto.RepoTest do
   end
 
   describe "dynamic repo" do
-    setup do
-      {:ok, pid} = TestRepo.start_link(name: nil)
+    setup config do
+      {:ok, pid} = TestRepo.start_link(name: config.test)
       TestRepo = TestRepo.put_dynamic_repo(pid)
       :ok
     end
@@ -2174,7 +2174,15 @@ defmodule Ecto.RepoTest do
       assert Process.get(:ecto_prepared)
     end
 
-    test "keeps the proper repo in  multi" do
+    test "keeps the proper repo in transact rollback", config do
+      assert TestRepo.transact(fn -> {:error, :oops} end) == {:error, :oops}
+
+      # Also check it works with named repos
+      TestRepo.put_dynamic_repo(config.test)
+      assert TestRepo.transact(fn -> {:error, :oops} end) == {:error, :oops}
+    end
+
+    test "keeps the proper repo in multi" do
       fun = fn repo, _changes -> {:ok, repo} end
       multi = Ecto.Multi.new() |> Ecto.Multi.run(:run, fun)
       assert {:ok, changes} = TestRepo.transaction(multi)