From 9ee32711bae3a6f423bf5e6d03bd56f648c73fe1 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 20 Dec 2013 15:55:34 +0800 Subject: [PATCH] bug fix --- mssql_test.go | 9 ++++++--- session.go | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mssql_test.go b/mssql_test.go index 39f03fd8..cde4081a 100644 --- a/mssql_test.go +++ b/mssql_test.go @@ -1,9 +1,12 @@ package xorm +// +// +build windows + import ( - _ "code.google.com/p/odbc" - _ "github.com/mattn/go-adodb" "testing" + + _ "github.com/lunny/godbc" ) /* @@ -12,7 +15,7 @@ utf8 COLLATE utf8_general_ci; */ func newMssqlEngine() (*Engine, error) { - return NewEngine("odbc", "driver={SQL Server};Server=127.0.0.1;Database=xorm_test; uid=sa; pwd=1234;") + return NewEngine("odbc", "driver={SQL Server};Server=192.168.20.135;Database=xorm_test; uid=sa; pwd=1234;") } func TestMssql(t *testing.T) { diff --git a/session.go b/session.go index df8acf9d..3840c721 100644 --- a/session.go +++ b/session.go @@ -1618,9 +1618,10 @@ func (session *Session) byte2Time(col *Column, data []byte) (outTime time.Time, ssd := strings.Split(sdata, " ") sdata = ssd[1] } - /*if len(sdata) > 8 { + if len(sdata) > 8 { sdata = sdata[len(sdata)-8:] - }*/ + } + fmt.Println(sdata) st := fmt.Sprintf("2006-01-02 %v", sdata) x, err = time.Parse("2006-01-02 15:04:05", st) } else {