HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nash Tsai 2013-12-24 11:52:22 +08:00
parent d6de8fbb8b 10bf7b2e7f
commit 6b4eca8204
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mssql.go
View File

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

6
session.go
View File

@ -1615,9 +1615,9 @@ func (session *Session) byte2Time(col *Column, data []byte) (outTime time.Time,
ssd := strings.Split(sdata, " ") ssd := strings.Split(sdata, " ")
sdata = ssd[1] sdata = ssd[1]
} }
if len(sdata) > 8 { //if len(sdata) > 8 {
sdata = sdata[len(sdata)-8:] // sdata = sdata[len(sdata)-8:]
} //}
fmt.Println(sdata) fmt.Println(sdata)
st := fmt.Sprintf("2006-01-02 %v", sdata) st := fmt.Sprintf("2006-01-02 %v", sdata)
x, err = time.Parse("2006-01-02 15:04:05", st) x, err = time.Parse("2006-01-02 15:04:05", st)