Merge remote-tracking branch 'upstream/master'

mssql.go

@@ -22,6 +22,7 @@ type odbcParser struct {
 func (p *odbcParser) parse(driverName, dataSourceName string) (*uri, error) {
 	kv := strings.Split(dataSourceName, ";")
 	var dbName string
+
 	for _, c := range kv {
 		vv := strings.Split(strings.TrimSpace(c), "=")
 		if len(vv) == 2 {
@@ -155,6 +156,7 @@ where a.object_id=object_id('` + tableName + `')`
 		for name, content := range record {
 			switch name {
 			case "name":
+
 				col.Name = strings.Trim(string(content), "` ")
 			case "ctype":
 				ct := strings.ToUpper(string(content))

session.go

@@ -1615,9 +1615,9 @@ func (session *Session) byte2Time(col *Column, data []byte) (outTime time.Time,
 			ssd := strings.Split(sdata, " ")
 			sdata = ssd[1]
 		}
-		if len(sdata) > 8 {
-			sdata = sdata[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)