소스 검색

fix: refine default sql and driver name for mssql bridge

JimMoen 2 년 전
부모
커밋
4e7472090b
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 3 3
      lib-ee/emqx_ee_bridge/src/emqx_ee_bridge_sqlserver.erl
  2. 2 2
      scripts/ct/run.sh
  3. 0 0
      scripts/install-msodbc-driver.sh

+ 3 - 3
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) ->
     [

+ 2 - 2
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=""

scripts/install-odbc-driver.sh → scripts/install-msodbc-driver.sh