From 4e7472090ba69208be2f5b462f3835ed1bfaf9b5 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Tue, 18 Apr 2023 10:37:05 +0800
Subject: [PATCH] fix: refine default sql and driver name for mssql bridge

---
 lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl      | 6 +++---
 scripts/ct/run.sh                                           | 4 ++--
 .../{install-odbc-driver.sh => install-msodbc-driver.sh}    | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename scripts/{install-odbc-driver.sh => install-msodbc-driver.sh} (100%)

diff --git a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
index e216299c2..49db815a6 100644
--- a/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
+++ b/lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
@@ -22,11 +22,11 @@
 ]).
 
 -define(DEFAULT_SQL, <<
-    "insert into t_mqtt_msg(msgid, topic, qos, payload)"
-    "values (${id}, ${topic}, ${qos}, ${payload})"
+    "insert into t_mqtt_msg(msgid, topic, qos, payload) "
+    "values ( ${id}, ${topic}, ${qos}, ${payload} )"
 >>).
 
--define(DEFAULT_DRIVER, <<"ms-sqlserver-18">>).
+-define(DEFAULT_DRIVER, <<"ms-sql">>).
 
 conn_bridge_examples(Method) ->
     [
diff --git a/scripts/ct/run.sh b/scripts/ct/run.sh
index 4e79476e0..a85aa36af 100755
--- a/scripts/ct/run.sh
+++ b/scripts/ct/run.sh
@@ -193,9 +193,9 @@ for dep in ${CT_DEPS}; do
 done
 
 if [ "$ODBC_REQUEST" = 'yes' ]; then
-    INSTALL_ODBC="./scripts/install-odbc-driver.sh"
+    INSTALL_ODBC="./scripts/install-msodbc-driver.sh"
 else
-    INSTALL_ODBC="echo 'Driver msodbcsql driver not requested'"
+    INSTALL_ODBC="echo 'msodbc driver not requested'"
 fi
 
 F_OPTIONS=""
diff --git a/scripts/install-odbc-driver.sh b/scripts/install-msodbc-driver.sh
similarity index 100%
rename from scripts/install-odbc-driver.sh
rename to scripts/install-msodbc-driver.sh