Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions lib/ecto/adapters/clickhouse.ex
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ defmodule Ecto.Adapters.ClickHouse do
@behaviour Ecto.Adapter.Schema
@behaviour Ecto.Adapter.Storage
@behaviour Ecto.Adapter.Structure
@behaviour Ecto.Adapter.Transaction

@conn __MODULE__.Connection
@driver :ch
Expand Down Expand Up @@ -160,6 +161,21 @@ defmodule Ecto.Adapters.ClickHouse do
Ecto.Adapters.SQL.checked_out?(meta)
end

@impl Ecto.Adapter.Transaction
def transaction(adapter_meta, opts, callback) do
Ecto.Adapters.SQL.transaction(adapter_meta, opts, callback)
end

@impl Ecto.Adapter.Transaction
def in_transaction?(%{pid: pool}) do
Ecto.Adapters.SQL.in_transaction?(%{pid: pool})
end

@impl Ecto.Adapter.Transaction
def rollback(adapter_meta, value) do
Ecto.Adapters.SQL.rollback(adapter_meta, value)
end

@impl Ecto.Adapter
def dumpers(:uuid, Ecto.UUID), do: [&__MODULE__.hex_uuid/1]
def dumpers(:uuid, type), do: [type, &__MODULE__.hex_uuid/1]
Expand Down
60 changes: 60 additions & 0 deletions test/ecto/adapters/clickhouse_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ defmodule Ecto.Adapters.ClickHouseTest do
use ExUnit.Case

alias Ecto.Adapters.ClickHouse
alias Ecto.Integration.TestRepo
import ExUnit.CaptureLog

describe "storage_up/1" do
test "create database" do
Expand Down Expand Up @@ -61,4 +63,62 @@ defmodule Ecto.Adapters.ClickHouseTest do
assert ClickHouse.storage_status(opts) == :up
end
end

describe "transaction callbacks" do
test "in_transaction?/1 is false for an idle checked out connection" do
TestRepo.checkout(fn ->
meta = Ecto.Adapter.lookup_meta(TestRepo.get_dynamic_repo())
refute ClickHouse.in_transaction?(meta)
end)
end

test "transaction/3 uses the checked out transactional connection" do
with_transaction_connection(fn meta ->
assert {:ok, :inside_transaction} =
ClickHouse.transaction(meta, [], fn ->
assert ClickHouse.in_transaction?(meta)
:inside_transaction
end)
end)
end

test "rollback/2 aborts the checked out transactional connection" do
capture_log(fn ->
with_transaction_connection(fn meta ->
assert {:error, :rolled_back} =
ClickHouse.transaction(meta, [], fn ->
assert ClickHouse.in_transaction?(meta)
ClickHouse.rollback(meta, :rolled_back)
end)
end)
end)
end

test "rollback/2 raises outside a transaction" do
TestRepo.checkout(fn ->
meta = Ecto.Adapter.lookup_meta(TestRepo.get_dynamic_repo())

assert_raise RuntimeError, "cannot call rollback outside of transaction", fn ->
ClickHouse.rollback(meta, :rolled_back)
end
end)
end
end

defp with_transaction_connection(fun) do
TestRepo.checkout(fn ->
meta = Ecto.Adapter.lookup_meta(TestRepo.get_dynamic_repo())
key = sql_conn_key(meta.pid)
conn = Process.get(key)
Process.put(key, %{conn | conn_mode: :transaction})

try do
fun.(meta)
after
Process.put(key, conn)
end
end)
end

defp sql_conn_key(pool), do: {Ecto.Adapters.SQL, pool}
end
Loading