Commit 5114b1f7 by linux chips

fixing a few fromattings

parent 1c1675af
...@@ -38,7 +38,7 @@ func NewMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin ...@@ -38,7 +38,7 @@ func NewMssqlQueryEndpoint(datasource *models.DataSource) (tsdb.TsdbQueryEndpoin
serport := datasource.Url serport := datasource.Url
// fix me: need to have a default port if user did not provide. i.e. 1433 // fix me: need to have a default port if user did not provide. i.e. 1433
words := strings.Split(serport,":") words := strings.Split(serport, ":")
server, port := words[0], words[1] server, port := words[0], words[1]
cnnstr := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;", cnnstr := fmt.Sprintf("server=%s;port=%s;database=%s;user id=%s;password=%s;",
server, server,
......
package mssql package mssql
import ( import (
"strings"
"testing" "testing"
"time" "time"
"strings"
_ "github.com/denisenkom/go-mssqldb" _ "github.com/denisenkom/go-mssqldb"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
...@@ -18,6 +18,7 @@ import ( ...@@ -18,6 +18,7 @@ import (
// and set up a MSSQL db named grafana_tests and a user/password grafana/password // and set up a MSSQL db named grafana_tests and a user/password grafana/password
// and set the variable below to the IP address of the database // and set the variable below to the IP address of the database
var serverIP string = "10.20.30.40" var serverIP string = "10.20.30.40"
func TestMSSQL(t *testing.T) { func TestMSSQL(t *testing.T) {
//SkipConvey("MSSQL", t, func() { //SkipConvey("MSSQL", t, func() {
SkipConvey("MSSQL", t, func() { SkipConvey("MSSQL", t, func() {
...@@ -100,15 +101,15 @@ func TestMSSQL(t *testing.T) { ...@@ -100,15 +101,15 @@ func TestMSSQL(t *testing.T) {
// fiix me: MSSQL driver puts the decimal inside an array of chars. and the test fails despite the values are correct. // fiix me: MSSQL driver puts the decimal inside an array of chars. and the test fails despite the values are correct.
//So(column[10].([]uint8), ShouldEqual, []uint8{'2', '.', '2', '2'}) //So(column[10].([]uint8), ShouldEqual, []uint8{'2', '.', '2', '2'})
So(column[11].(float64), ShouldEqual, 3.33) So(column[11].(float64), ShouldEqual, 3.33)
So(column[12].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Now().UTC() ) So(column[12].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Now().UTC())
So(column[13].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Now().UTC().Truncate(24*time.Hour) ) So(column[13].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Now().UTC().Truncate(24*time.Hour))
So(column[14].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Date( 1, time.January, 1, time.Now().UTC().Hour(), time.Now().UTC().Minute(), time.Now().UTC().Second(), 0, time.UTC) ) So(column[14].(time.Time), ShouldHappenWithin, time.Duration(15*time.Second), time.Date(1, time.January, 1, time.Now().UTC().Hour(), time.Now().UTC().Minute(), time.Now().UTC().Second(), 0, time.UTC))
}) })
}) })
} }
func InitMSSQLTestDB(t *testing.T) *xorm.Engine { func InitMSSQLTestDB(t *testing.T) *xorm.Engine {
x, err := xorm.NewEngine(sqlutil.TestDB_Mssql.DriverName, strings.Replace(sqlutil.TestDB_Mssql.ConnStr, "localhost", serverIP, 1) ) x, err := xorm.NewEngine(sqlutil.TestDB_Mssql.DriverName, strings.Replace(sqlutil.TestDB_Mssql.ConnStr, "localhost", serverIP, 1))
// x.ShowSQL() // x.ShowSQL()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment