Implement new checked_out? callback

Author: josevalim

integration_test/sql/sandbox.exs

@@ -241,26 +241,42 @@ defmodule Ecto.Integration.SandboxTest do
   describe "checkouts" do
     test "with transaction inside checkout" do
       Sandbox.checkout(TestRepo)
+      refute TestRepo.checked_out?()
+      refute TestRepo.in_transaction?()
 
       TestRepo.checkout(fn ->
+        assert TestRepo.checked_out?()
         refute TestRepo.in_transaction?()
         TestRepo.transaction(fn ->
+          assert TestRepo.checked_out?()
           assert TestRepo.in_transaction?()
         end)
+        assert TestRepo.checked_out?()
         refute TestRepo.in_transaction?()
       end)
+
+      refute TestRepo.checked_out?()
+      refute TestRepo.in_transaction?()
     end
 
     test "with checkout inside transaction" do
       Sandbox.checkout(TestRepo)
+      refute TestRepo.checked_out?()
+      refute TestRepo.in_transaction?()
 
       TestRepo.transaction(fn ->
+        assert TestRepo.checked_out?()
         assert TestRepo.in_transaction?()
         TestRepo.checkout(fn ->
+          assert TestRepo.checked_out?()
           assert TestRepo.in_transaction?()
         end)
+        assert TestRepo.checked_out?()
         assert TestRepo.in_transaction?()
       end)
+
+      refute TestRepo.checked_out?()
+      refute TestRepo.in_transaction?()
     end
   end
 

lib/ecto/adapters/sql.ex

@@ -97,6 +97,11 @@ defmodule Ecto.Adapters.SQL do
         Ecto.Adapters.SQL.checkout(meta, opts, fun)
       end
 
+      @impl true
+      def checked_out?(meta) do
+        Ecto.Adapters.SQL.checked_out?(meta)
+      end
+
       @impl true
       def loaders({:map, _}, type),   do: [&Ecto.Type.embedded_load(type, &1, :json)]
       def loaders(:binary_id, type),  do: [Ecto.UUID, type]
@@ -636,6 +641,12 @@ defmodule Ecto.Adapters.SQL do
     checkout_or_transaction(:run, adapter_meta, opts, callback)
   end
 
+  @doc false
+  def checked_out?(adapter_meta) do
+    %{pid: pool} = adapter_meta
+    get_conn(pool) != nil
+  end
+
   ## Query
 
   @doc false
@@ -754,13 +765,13 @@ defmodule Ecto.Adapters.SQL do
     opts = with_log(telemetry, params, opts ++ default_opts)
 
     case get_conn(pool) do
-      nil  ->
-        raise "cannot reduce stream outside of transaction"
-
-      conn ->
+      %DBConnection{conn_mode: :transaction} = conn ->
         sql
         |> apply(:stream, [conn, statement, params, opts])
         |> Enumerable.reduce(acc, fun)
+
+      _ ->
+        raise "cannot reduce stream outside of transaction"
     end
   end
 
@@ -770,12 +781,13 @@ defmodule Ecto.Adapters.SQL do
     opts = with_log(telemetry, params, opts ++ default_opts)
 
     case get_conn(pool) do
-      nil ->
-        raise "cannot collect into stream outside of transaction"
-      conn ->
+      %DBConnection{conn_mode: :transaction} = conn ->
         sql
         |> apply(:stream, [conn, statement, params, opts])
         |> Collectable.into()
+
+      _ ->
+        raise "cannot collect into stream outside of transaction"
     end
   end
 

test/mix/tasks/ecto.dump_load_test.exs

@@ -13,6 +13,7 @@ defmodule Mix.Tasks.Ecto.DumpLoadTest do
     def dumpers(_, _), do: raise "not implemented"
     def loaders(_, _), do: raise "not implemented"
     def checkout(_, _, _), do: raise "not implemented"
+    def checked_out?(_), do: raise "not implemented"
     def ensure_all_started(_, _), do: {:ok, []}
 
     def init(_opts) do

test/test_repo.exs

@@ -34,6 +34,7 @@ defmodule EctoSQL.TestAdapter do
   end
 
   def checkout(_, _, _), do: raise "not implemented"
+  def checked_out?(_), do: raise "not implemented"
   def delete(_, _, _, _), do: raise "not implemented"
   def insert_all(_, _, _, _, _, _, _, _), do: raise "not implemented"
   def rollback(_, _), do: raise "not implemented"