Skip to content

Make with_transaction work with explicitly specifed pool name. #23

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

Closed
lukyanov wants to merge 4 commits into from
Closed

Make with_transaction work with explicitly specifed pool name. #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
faf5876
Make `with_transaction` work with explicitly specifed pool name.
lukyanov Aug 24, 2017
a59a9b5
Revert "Make `with_transaction` work with explicitly specifed pool na…
lukyanov Aug 25, 2017
12af53b
`with_transaction` now accepts Fun/1
lukyanov Aug 25, 2017
98bf919
Fix README.md
lukyanov Aug 25, 2017
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
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ API use:
application:ensure_all_started(pgapp).
pgapp:connect([{size, 10}, {database, "mydb"}, {username, "foo"}, {password, "bar"}]).
pgapp:equery("select current_date", []),
pgapp:with_transaction(fun() ->
pgapp:squery("update ..."),
pgapp:squery("delete from ..."),
pgapp:equery("select ? from ?", ["*", Table])
pgapp:with_transaction(fun(Conn) ->
pgapp:squery(Conn, "update ..."),
pgapp:squery(Conn, "delete from ..."),
pgapp:equery(Conn, "select ? from ?", ["*", Table])
end).

- Multi pool:
Expand Down
42 changes: 27 additions & 15 deletions src/pgapp.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ equery(Sql, Params) ->
(PoolName :: atom(),
Sql::epgsql:sql_query(),
Params :: list(epgsql:bind_param()))
-> epgsql:reply(epgsql:equery_row()) | {error, Reason :: any()};
(Conn :: pid(),
Sql::epgsql:sql_query(),
Params :: list(epgsql:bind_param()))
-> epgsql:reply(epgsql:equery_row()) | {error, Reason :: any()}.
equery(P1, P2, P3) ->
pgapp_worker:equery(P1, P2, P3).
Expand All @@ -66,12 +70,14 @@ squery(Sql) ->
[epgsql:reply(epgsql:squery_row())] | {error, Reason :: any()};
(PoolName :: atom(),
Sql::epgsql:sql_query())
-> epgsql:reply(epgsql:squery_row()) |
[epgsql:reply(epgsql:squery_row())] | {error, Reason :: any()};
(Conn :: pid(),
Sql::epgsql:sql_query())
-> epgsql:reply(epgsql:squery_row()) |
[epgsql:reply(epgsql:squery_row())] | {error, Reason :: any()}.
squery(PoolName, Sql) when is_atom(PoolName) ->
pgapp_worker:squery(PoolName, Sql);
squery(Sql, Timeout) ->
pgapp_worker:squery(Sql, Timeout).
squery(P1, P2) ->
pgapp_worker:squery(P1, P2).

-spec squery(PoolName :: atom(),
Sql :: epgsql:sql_query(),
Expand All @@ -81,29 +87,35 @@ squery(Sql, Timeout) ->
squery(PoolName, Sql, Timeout) ->
pgapp_worker:squery(PoolName, Sql, Timeout).

-spec with_transaction(Function :: fun(() -> Reply))
-spec with_transaction(Function :: fun((pid()) -> Reply))
-> Reply | {rollback | error, any()} when Reply :: any().
with_transaction(Fun) when is_function(Fun, 0) ->
with_transaction(Fun) when is_function(Fun, 1) ->
with_transaction(epgsql_pool, Fun).

-spec with_transaction(PoolName :: atom(),
Function :: fun(() -> Reply))
Function :: fun((pid()) -> Reply))
-> Reply | {rollback | error, any()} when Reply :: any();
(Conn :: pid(),
Function :: fun((pid()) -> Reply))
-> Reply | {rollback | error, any()} when Reply :: any();
(Function :: fun(() -> Reply),
(Function :: fun((pid()) -> Reply),
Timeout :: timeout())
-> Reply | {rollback | error, any()} when Reply :: any().
with_transaction(PoolName, Fun) when is_function(Fun, 0);
is_atom(PoolName) ->
pgapp_worker:with_transaction(PoolName, Fun);
with_transaction(Fun, Timeout) when is_function(Fun, 0) ->
with_transaction(P1, Fun) when is_function(Fun, 1) ->
pgapp_worker:with_transaction(P1, Fun);
with_transaction(Fun, Timeout) when is_function(Fun, 1) ->
pgapp_worker:with_transaction(epgsql_pool, Fun, Timeout).

-spec with_transaction(PoolName :: atom(),
Function :: fun(() -> Reply),
Function :: fun((pid()) -> Reply),
Timeout :: atom() | non_neg_integer())
-> Reply | {rollback | error, any()} when Reply :: any();
(Conn :: pid(),
Function :: fun((pid()) -> Reply),
Timeout :: atom() | non_neg_integer())
-> Reply | {rollback | error, any()} when Reply :: any().
with_transaction(PoolName, Fun, Timeout) when is_function(Fun, 0) ->
pgapp_worker:with_transaction(PoolName, Fun, Timeout).
with_transaction(P1, Fun, Timeout) when is_function(Fun, 1) ->
pgapp_worker:with_transaction(P1, Fun, Timeout).

%%--------------------------------------------------------------------
%% @doc
Expand Down
30 changes: 11 additions & 19 deletions src/pgapp_worker.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,13 @@
-define(MAXIMUM_DELAY, 5 * 60 * 1000). % Five minutes
-define(TIMEOUT, 5 * 1000).

-define(STATE_VAR, '$pgapp_state').

squery(Sql) ->
case get(?STATE_VAR) of
undefined ->
squery(epgsql_pool, Sql);
Conn ->
epgsql:squery(Conn, Sql)
end.
squery(epgsql_pool, Sql).

squery(PoolName, Sql) when is_atom(PoolName) ->
squery(PoolName, Sql, ?TIMEOUT);
squery(Conn, Sql) when is_pid(Conn) ->
epgsql:squery(Conn, Sql);
squery(Sql, Timeout) ->
squery(epgsql_pool, Sql, Timeout).

Expand All @@ -48,15 +43,12 @@ squery(PoolName, Sql, Timeout) ->
end, Timeout).

equery(Sql, Params) ->
case get(?STATE_VAR) of
undefined ->
equery(epgsql_pool, Sql, Params);
Conn ->
epgsql:equery(Conn, Sql, Params)
end.
equery(epgsql_pool, Sql, Params).

equery(PoolName, Sql, Params) when is_atom(PoolName) ->
equery(PoolName, Sql, Params, ?TIMEOUT);
equery(Conn, Sql, Params) when is_pid(Conn) ->
epgsql:equery(Conn, Sql, Params);
equery(Sql, Params, Timeout) ->
equery(epgsql_pool, Sql, Params, Timeout).

Expand All @@ -70,12 +62,14 @@ equery(PoolName, Sql, Params, Timeout) ->
with_transaction(PoolName, Fun) ->
with_transaction(PoolName, Fun, ?TIMEOUT).

with_transaction(PoolName, Fun, Timeout) ->
with_transaction(PoolName, Fun, Timeout) when is_atom(PoolName) ->
middle_man_transaction(PoolName,
fun (W) ->
gen_server:call(W, {transaction, Fun},
Timeout)
end, Timeout).
end, Timeout);
with_transaction(Conn, Fun, _Timeout) when is_pid(Conn) ->
epgsql:with_transaction(Conn, Fun).

middle_man_transaction(Pool, Fun, Timeout) ->
Tag = make_ref(),
Expand Down Expand Up @@ -112,9 +106,7 @@ handle_call({equery, Sql, Params}, _From,
{reply, epgsql:equery(Conn, Sql, Params), State};
handle_call({transaction, Fun}, _From,
#state{conn = Conn} = State) ->
put(?STATE_VAR, Conn),
Result = epgsql:with_transaction(Conn, fun(_) -> Fun() end),
erase(?STATE_VAR),
Result = epgsql:with_transaction(Conn, Fun),
{reply, Result, State}.

handle_cast(reconnect, State) ->
Expand Down