From 27fdf644aa5fa75906b5791c6d8cba08f96ae9fd Mon Sep 17 00:00:00 2001 From: JimMoen Date: Mon, 10 Apr 2023 16:18:29 +0800 Subject: [PATCH] fix(sqlserver): let a single query be a length 1 batch Need to be fixed: `emqx_plugin_libs_rule:proc_tmpl/2` won't add single quotes for string --- .../src/emqx_ee_connector_sqlserver.erl | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl index 4cc92e80a..214663b22 100644 --- a/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl +++ b/lib-ee/emqx_ee_connector/src/emqx_ee_connector_sqlserver.erl @@ -502,15 +502,18 @@ parse_sql_template([], SingleInsertTks, BatchInsertTks) -> %% single insert apply_template( - {?ACTION_SEND_MESSAGE = Key, Msg} = Query, - #{?SINGLE_INSERT_TEMP := SingleInsertTks} = _Templates + {?ACTION_SEND_MESSAGE = _Key, _Msg} = Query, + #{?SINGLE_INSERT_TEMP := _SingleInsertTks} = Templates ) -> - case maps:get(Key, SingleInsertTks, undefined) of - undefined -> - Query; - Template -> - {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)} - end; + %% TODO: fix emqx_plugin_libs_rule:proc_tmpl/2 + %% it won't add single quotes for string + apply_template([Query], Templates); +%% case maps:get(Key, SingleInsertTks, undefined) of +%% undefined -> +%% Query; +%% Template -> +%% {Key, emqx_plugin_libs_rule:proc_tmpl(Template, Msg)} +%% end; %% batch inserts apply_template( [{?ACTION_SEND_MESSAGE = Key, _Msg} | _T] = BatchReqs,