Merge pull request #222 from plausible/fix-ci

CI: add CLICKHOUSE_PASSWORD

Author: ruslandoga

.github/workflows/mix.yml

@@ -46,6 +46,7 @@ jobs:
           - 8123:8123
         env:
           TZ: ${{ matrix.timezone }}
+          CLICKHOUSE_PASSWORD: default
           options: >-
             --health-cmd nc -zw3 localhost 8124
             --health-interval 10s

test/ecto/adapters/clickhouse/migration_test.exs

@@ -1,6 +1,6 @@
 defmodule Ecto.Adapters.ClickHouse.MigrationTest do
   use ExUnit.Case
-
+  import Ecto.Integration.Case, only: [client_opts: 1]
   alias Ecto.Adapters.ClickHouse
 
   defmodule MigrationRepo do
@@ -55,13 +55,15 @@ defmodule Ecto.Adapters.ClickHouse.MigrationTest do
 
   test "events (table+index)" do
     database = "ecto_ch_migration_test_events"
-    opts = [database: database]
+    opts = client_opts(database: database)
 
     assert :ok = ClickHouse.storage_up(opts)
     on_exit(fn -> ClickHouse.storage_down(opts) end)
 
     Application.put_env(:migration_test, MigrationRepo,
       database: database,
+      username: Keyword.fetch!(opts, :username),
+      password: Keyword.fetch!(opts, :password),
       show_sensitive_data_on_connection_error: true
     )
 

test/ecto/adapters/clickhouse/structure_test.exs

@@ -1,6 +1,6 @@
 defmodule Ecto.Adapters.ClickHouse.StructureTest do
   use ExUnit.Case
-
+  import Ecto.Integration.Case, only: [client_opts: 1]
   alias Ecto.Adapters.ClickHouse
 
   defmodule Repo do
@@ -83,7 +83,7 @@ defmodule Ecto.Adapters.ClickHouse.StructureTest do
 
   describe "structure_dump/1" do
     test "dump unknown db" do
-      opts = [database: "ecto_ch_does_not_exist"]
+      opts = client_opts(database: "ecto_ch_does_not_exist")
 
       assert {:error, %Ch.Error{code: 81, message: message}} =
                ClickHouse.structure_dump("priv/repo", opts)
@@ -92,7 +92,7 @@ defmodule Ecto.Adapters.ClickHouse.StructureTest do
     end
 
     test "dumps empty database" do
-      opts = [database: "ecto_ch_temp_structure_empty"]
+      opts = client_opts(database: "ecto_ch_temp_structure_empty")
 
       assert :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)
@@ -105,13 +105,15 @@ defmodule Ecto.Adapters.ClickHouse.StructureTest do
 
     test "dumps migrated database" do
       database = "ecto_ch_temp_structure_migrated"
-      opts = [database: database]
+      opts = client_opts(database: database)
 
       assert :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)
 
       Application.put_env(:structure_test, Repo,
         database: database,
+        username: Keyword.fetch!(opts, :username),
+        password: Keyword.fetch!(opts, :password),
         show_sensitive_data_on_connection_error: true
       )
 
@@ -238,13 +240,15 @@ defmodule Ecto.Adapters.ClickHouse.StructureTest do
   describe "structure_load/2" do
     setup do
       database = "ecto_ch_temp_structure_load"
-      opts = [database: database]
+      opts = client_opts(database: database)
 
       assert :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)
 
       Application.put_env(:structure_test, Repo,
         database: database,
+        username: Keyword.fetch!(opts, :username),
+        password: Keyword.fetch!(opts, :password),
         show_sensitive_data_on_connection_error: true
       )
 

test/ecto/adapters/clickhouse_test.exs

@@ -1,22 +1,22 @@
 defmodule Ecto.Adapters.ClickHouseTest do
   use ExUnit.Case
-
+  import Ecto.Integration.Case, only: [client_opts: 0, client_opts: 1]
   alias Ecto.Adapters.ClickHouse
 
   describe "storage_up/1" do
     test "create database" do
-      opts = [database: "ecto_ch_temp_db"]
+      opts = client_opts(database: "ecto_ch_temp_db")
 
       assert :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)
 
-      conn = start_supervised!(Ch)
+      conn = start_supervised!({Ch, client_opts()})
       assert {:ok, %{rows: rows}} = Ch.query(conn, "show databases")
       assert ["ecto_ch_temp_db"] in rows
     end
 
     test "does not fail on second call" do
-      opts = [database: "ecto_ch_temp_db_2"]
+      opts = client_opts(database: "ecto_ch_temp_db_2")
 
       assert :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)
@@ -33,12 +33,12 @@ defmodule Ecto.Adapters.ClickHouseTest do
 
   describe "storage_down/1" do
     test "storage down (twice)" do
-      opts = [database: "ecto_ch_temp_down_2"]
+      opts = client_opts(database: "ecto_ch_temp_down_2")
 
       assert :ok = ClickHouse.storage_up(opts)
       assert :ok = ClickHouse.storage_down(opts)
 
-      conn = start_supervised!(Ch)
+      conn = start_supervised!({Ch, client_opts()})
       assert {:ok, %{rows: rows}} = Ch.query(conn, "show databases")
       refute ["ecto_ch_temp_down_2"] in rows
 
@@ -48,12 +48,12 @@ defmodule Ecto.Adapters.ClickHouseTest do
 
   describe "storage_status/1" do
     test "when database is down" do
-      opts = [database: "ecto_ch_temp_status_down"]
+      opts = client_opts(database: "ecto_ch_temp_status_down")
       assert ClickHouse.storage_status(opts) == :down
     end
 
     test "when database is up" do
-      opts = [database: "ecto_ch_temp_status_up"]
+      opts = client_opts(database: "ecto_ch_temp_status_up")
 
       :ok = ClickHouse.storage_up(opts)
       on_exit(fn -> ClickHouse.storage_down(opts) end)

test/support/integration_case.ex

@@ -45,4 +45,10 @@ defmodule Ecto.Integration.Case do
     [[version]] = TestRepo.query!("select version()").rows
     version
   end
+
+  def client_opts(overrides \\ []) do
+    TestRepo.config()
+    |> Keyword.put(:pool_size, 1)
+    |> Keyword.merge(overrides)
+  end
 end

test/test_helper.exs

@@ -9,6 +9,8 @@ alias Ecto.Integration.TestRepo
 Application.put_env(:ecto_ch, TestRepo,
   adapter: Ecto.Adapters.ClickHouse,
   database: "ecto_ch_test",
+  username: System.get_env("CLICKHOUSE_USER", "default"),
+  password: System.get_env("CLICKHOUSE_PASSWORD", "default"),
   show_sensitive_data_on_connection_error: true
 )