yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: apply review comments

This commit is contained in:
Thales Macedo Garitezi 2024-06-17 09:40:33 -03:00
parent 6e702cd16c
commit b71212b022
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/emqx_postgresql/src/emqx_postgresql.erl
View File

@ -401,7 +401,7 @@ on_batch_query(InstId, BatchReq, State) ->
proc_sql_params(ActionResId, #{} = Map, [], State) when is_binary(ActionResId) -> proc_sql_params(ActionResId, #{} = Map, [], State) when is_binary(ActionResId) ->
%% When this connector is called from actions/bridges. %% When this connector is called from actions/bridges.
DisablePreparedStatements = maps:get(prepares, State, #{}) =:= disabled, DisablePreparedStatements = prepared_statements_disabled(State),
{ExprTemplate, RowTemplate} = get_template(ActionResId, State), {ExprTemplate, RowTemplate} = get_template(ActionResId, State),
Rendered = render_prepare_sql_row(RowTemplate, Map), Rendered = render_prepare_sql_row(RowTemplate, Map),
case DisablePreparedStatements of case DisablePreparedStatements of
@ -412,7 +412,7 @@ proc_sql_params(ActionResId, #{} = Map, [], State) when is_binary(ActionResId) -
end; end;
proc_sql_params(prepared_query, ConnResId, Params, State) -> proc_sql_params(prepared_query, ConnResId, Params, State) ->
%% When this connector is called from authn/authz modules %% When this connector is called from authn/authz modules
DisablePreparedStatements = maps:get(prepares, State, #{}) =:= disabled, DisablePreparedStatements = prepared_statements_disabled(State),
case DisablePreparedStatements of case DisablePreparedStatements of
true -> true ->
#{query_templates := #{ConnResId := {ExprTemplate, _VarsTemplate}}} = State, #{query_templates := #{ConnResId := {ExprTemplate, _VarsTemplate}}} = State,
@ -422,11 +422,16 @@ proc_sql_params(prepared_query, ConnResId, Params, State) ->
{prepared_query, ConnResId, Params} {prepared_query, ConnResId, Params}
end; end;
proc_sql_params(QueryType, SQL, Params, _State) when proc_sql_params(QueryType, SQL, Params, _State) when
is_atom(QueryType), is_binary(SQL) orelse is_list(SQL), is_list(Params) is_atom(QueryType) andalso
(is_binary(SQL) orelse is_list(SQL)) andalso
is_list(Params)
-> ->
%% When called to do ad-hoc commands/queries. %% When called to do ad-hoc commands/queries.
{QueryType, SQL, Params}. {QueryType, SQL, Params}.
prepared_statements_disabled(State) ->
maps:get(prepares, State, #{}) =:= disabled.
get_template(Key, #{installed_channels := Channels} = _State) when is_map_key(Key, Channels) -> get_template(Key, #{installed_channels := Channels} = _State) when is_map_key(Key, Channels) ->
BinKey = to_bin(Key), BinKey = to_bin(Key),
ChannelState = maps:get(BinKey, Channels), ChannelState = maps:get(BinKey, Channels),