Skip to content

fix: reuse pool_config for migrator tmp pool #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Taure merged 1 commit into from
Apr 3, 2026
Merged

fix: reuse pool_config for migrator tmp pool #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions src/kura_migrator.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,12 @@ ensure_database(RepoMod) ->
end.

do_ensure_database(Config, Database) ->
TmpPool = kura_migrator_tmp_pool,
Host = binary_to_list(maps:get(hostname, Config, ~"localhost")),
Port = maps:get(port, Config, 5432),
User = binary_to_list(maps:get(username, Config, ~"postgres")),
Password = binary_to_list(maps:get(password, Config, <<>>)),
TmpPool = kura_migrator_tmp_pool,
TmpConfig = #{
TmpBase = #{
host => Host,
port => Port,
database => "postgres",
Expand All @@ -123,6 +123,12 @@ do_ensure_database(Config, Database) ->
pool_size => 1,
decode_opts => [return_rows_as_maps, column_name_as_atom]
},
SocketOpts = application:get_env(kura, socket_options, []),
TmpConfig =
case SocketOpts of
Opts when is_list(Opts), Opts =/= [] -> TmpBase#{socket_options => Opts};
_ -> TmpBase
end,
case pgo_sup:start_child(TmpPool, TmpConfig) of
{ok, _} -> ok;
{error, {already_started, _}} -> ok
Expand All @@ -139,11 +145,17 @@ do_ensure_database(Config, Database) ->
SQL = iolist_to_binary([~"CREATE DATABASE ", QuotedDb]),
_ = pgo:query(SQL, [], PoolOpts),
logger:info("Kura: created database ~s", [Database]),
ok;
stop_tmp_pool(TmpPool);
#{rows := [_ | _]} ->
ok
stop_tmp_pool(TmpPool)
end.

-spec stop_tmp_pool(atom()) -> ok.
stop_tmp_pool(TmpPool) ->
_ = supervisor:terminate_child(pgo_sup, TmpPool),
_ = supervisor:delete_child(pgo_sup, TmpPool),
ok.

%%----------------------------------------------------------------------
%% Schema migrations table
%%----------------------------------------------------------------------
Expand Down
Loading