From 1d5809217616bcb6d4360318c734f4c2f04b46b8 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 1 Mar 2024 11:36:15 +0800
Subject: [PATCH] fix: bridge v2 `on_query` matched ChannelId

---
 .../src/emqx_bridge_sqlserver_connector.erl          | 12 ++++++------
 rel/i18n/emqx_bridge_sqlserver.hocon                 |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl
index 13f03fb55..1eb9746dc 100644
--- a/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl
+++ b/apps/emqx_bridge_sqlserver/src/emqx_bridge_sqlserver_connector.erl
@@ -128,9 +128,9 @@
 %% -type size() :: integer().
 
 -type state() :: #{
+    installed_channels := map(),
     pool_name := binary(),
-    resource_opts := map(),
-    sql_templates := map()
+    resource_opts := map()
 }.
 
 %%====================================================================
@@ -288,14 +288,14 @@ on_stop(InstanceId, _State) ->
 
 -spec on_query(
     resource_id(),
-    {?ACTION_SEND_MESSAGE, map()},
+    Query :: {channel_id(), map()},
     state()
 ) ->
     ok
     | {ok, list()}
     | {error, {recoverable_error, term()}}
     | {error, term()}.
-on_query(ResourceId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
+on_query(ResourceId, {_ChannelId, _Msg} = Query, State) ->
     ?TRACE(
         "SINGLE_QUERY_SYNC",
         "bridge_sqlserver_received",
@@ -305,7 +305,7 @@ on_query(ResourceId, {?ACTION_SEND_MESSAGE, _Msg} = Query, State) ->
 
 -spec on_batch_query(
     resource_id(),
-    [{?ACTION_SEND_MESSAGE, map()}],
+    [{channel_id(), map()}],
     state()
 ) ->
     ok
@@ -383,7 +383,7 @@ conn_str([{_, _} | Opts], Acc) ->
 %% Query with singe & batch sql statement
 -spec do_query(
     resource_id(),
-    Query :: {?ACTION_SEND_MESSAGE, map()} | [{?ACTION_SEND_MESSAGE, map()}],
+    Query :: {channel_id(), map()} | [{channel_id(), map()}],
     ApplyMode :: handover,
     state()
 ) ->
diff --git a/rel/i18n/emqx_bridge_sqlserver.hocon b/rel/i18n/emqx_bridge_sqlserver.hocon
index aa63b0a89..b1c7f8405 100644
--- a/rel/i18n/emqx_bridge_sqlserver.hocon
+++ b/rel/i18n/emqx_bridge_sqlserver.hocon
@@ -59,7 +59,7 @@ sqlserver_action.label:
 """Microsoft SOL Server Action Configuration"""
 
 config_connector.desc:
-"""Configuration for an Microsoft SOL Server connector."""
+"""Configuration for a Microsoft SOL Server connector."""
 
 config_connector.label:
 """Microsoft SOL Server Connector Configuration"""