forked from gitea/gitea
1
0
Fork 0

update xorm for bugs fix (#728)

This commit is contained in:
Lunny Xiao 2017-01-23 19:11:57 +08:00 committed by GitHub
parent a8048c19f3
commit 907b6f943c
3 changed files with 5 additions and 5 deletions

View File

@ -359,7 +359,7 @@ func (engine *Engine) DBMetas() ([]*core.Table, error) {
if col := table.GetColumn(name); col != nil { if col := table.GetColumn(name); col != nil {
col.Indexes[index.Name] = index.Type col.Indexes[index.Name] = index.Type
} else { } else {
return nil, fmt.Errorf("Unknown col %s in indexe %v of table %v, columns %v", name, index.Name, table.Name, table.ColumnsSeq()) return nil, fmt.Errorf("Unknown col %s in index %v of table %v, columns %v", name, index.Name, table.Name, table.ColumnsSeq())
} }
} }
} }

View File

@ -317,7 +317,7 @@ func (db *sqlite3) GetColumns(tableName string) ([]string, map[string]*core.Colu
col.DefaultIsEmpty = true col.DefaultIsEmpty = true
for idx, field := range fields { for idx, field := range fields {
if idx == 0 { if idx == 0 {
col.Name = strings.Trim(field, "`[] ") col.Name = strings.Trim(strings.Trim(field, "`[] "), `"`)
continue continue
} else if idx == 1 { } else if idx == 1 {
col.SQLType = core.SQLType{Name: field, DefaultLength: 0, DefaultLength2: 0} col.SQLType = core.SQLType{Name: field, DefaultLength: 0, DefaultLength2: 0}

6
vendor/vendor.json vendored
View File

@ -243,10 +243,10 @@
"revisionTime": "2016-08-11T02:11:45Z" "revisionTime": "2016-08-11T02:11:45Z"
}, },
{ {
"checksumSHA1": "kAy5B68FSqoQNXWGnwdmmzZ0ElQ=", "checksumSHA1": "V3Sy7+JY2PVw3EkfajS4DxCDBg8=",
"path": "github.com/go-xorm/xorm", "path": "github.com/go-xorm/xorm",
"revision": "c360c20aa58a6dec86084967e93f673c57278da1", "revision": "57bcb65078410bcd5c7c8ee52d7494e7b5146a04",
"revisionTime": "2017-01-20T02:12:06Z" "revisionTime": "2017-01-22T09:17:55Z"
}, },
{ {
"checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=", "checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=",