浏览代码

add encrypt connstr param conditionally on the value chosen via GUI.

Ramiro Morales 7 年之前
父节点
当前提交
49a3bd3097
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      pkg/tsdb/mssql/mssql.go

+ 5 - 2
pkg/tsdb/mssql/mssql.go

@@ -53,14 +53,17 @@ func generateConnectionString(datasource *models.DataSource) string {
 
 
 	server, port := hostParts[0], hostParts[1]
 	server, port := hostParts[0], hostParts[1]
 	encrypt := datasource.JsonData.Get("encrypt").MustString("false")
 	encrypt := datasource.JsonData.Get("encrypt").MustString("false")
-	return fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;encrypt=%s;",
+	connStr := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;",
 		server,
 		server,
 		port,
 		port,
 		datasource.Database,
 		datasource.Database,
 		datasource.User,
 		datasource.User,
 		password,
 		password,
-		encrypt,
 	)
 	)
+	if encrypt != "false" {
+		connStr += fmt.Sprintf("encrypt=%s;", encrypt)
+	}
+	return connStr
 }
 }
 
 
 type mssqlRowTransformer struct {
 type mssqlRowTransformer struct {