Merge remote-tracking branch 'upstream/master' into update-xorm

pkg/services/sqlstore/sqlstore.go

@@ -24,6 +24,8 @@ import (
 	"github.com/go-xorm/xorm"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
+
+	_ "github.com/grafana/grafana/pkg/tsdb/mssql"
 )
 
 type DatabaseConfig struct {

pkg/services/sqlstore/sqlutil/sqlutil.go

@@ -14,6 +14,7 @@ type TestDB struct {
 var TestDB_Sqlite3 = TestDB{DriverName: "sqlite3", ConnStr: ":memory:"}
 var TestDB_Mysql = TestDB{DriverName: "mysql", ConnStr: "grafana:password@tcp(localhost:3306)/grafana_tests?collation=utf8mb4_unicode_ci"}
 var TestDB_Postgres = TestDB{DriverName: "postgres", ConnStr: "user=grafanatest password=grafanatest host=localhost port=5432 dbname=grafanatest sslmode=disable"}
+var TestDB_Mssql = TestDB{DriverName: "mssql", ConnStr: "server=localhost;port=1433;database=grafanatest;user id=grafana;password=Password!"}
 
 func CleanDB(x *xorm.Engine) {
 	if x.DriverName() == "postgres" {