diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-01-23 19:11:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 19:11:57 +0800 |
| commit | 907b6f943ce632ee49568237f0d430dedb616f92 (patch) | |
| tree | 78ecb616180290c62aede3d319130434e018b843 | |
| parent | a8048c19f3dba52bbc0db6a0d8cbdfdf3fb6c149 (diff) | |
| download | gitea-907b6f943ce632ee49568237f0d430dedb616f92.tar.gz gitea-907b6f943ce632ee49568237f0d430dedb616f92.zip | |
update xorm for bugs fix (#728)
| -rw-r--r-- | vendor/github.com/go-xorm/xorm/engine.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/go-xorm/xorm/sqlite3_dialect.go | 2 | ||||
| -rw-r--r-- | vendor/vendor.json | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vendor/github.com/go-xorm/xorm/engine.go b/vendor/github.com/go-xorm/xorm/engine.go index 9e7b003782..1ee1589c31 100644 --- a/vendor/github.com/go-xorm/xorm/engine.go +++ b/vendor/github.com/go-xorm/xorm/engine.go @@ -359,7 +359,7 @@ func (engine *Engine) DBMetas() ([]*core.Table, error) { if col := table.GetColumn(name); col != nil { col.Indexes[index.Name] = index.Type } 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()) } } } diff --git a/vendor/github.com/go-xorm/xorm/sqlite3_dialect.go b/vendor/github.com/go-xorm/xorm/sqlite3_dialect.go index 7ad153a34d..b72459aeb9 100644 --- a/vendor/github.com/go-xorm/xorm/sqlite3_dialect.go +++ b/vendor/github.com/go-xorm/xorm/sqlite3_dialect.go @@ -317,7 +317,7 @@ func (db *sqlite3) GetColumns(tableName string) ([]string, map[string]*core.Colu col.DefaultIsEmpty = true for idx, field := range fields { if idx == 0 { - col.Name = strings.Trim(field, "`[] ") + col.Name = strings.Trim(strings.Trim(field, "`[] "), `"`) continue } else if idx == 1 { col.SQLType = core.SQLType{Name: field, DefaultLength: 0, DefaultLength2: 0} diff --git a/vendor/vendor.json b/vendor/vendor.json index e55114093d..85e0dd968e 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -243,10 +243,10 @@ "revisionTime": "2016-08-11T02:11:45Z" }, { - "checksumSHA1": "kAy5B68FSqoQNXWGnwdmmzZ0ElQ=", + "checksumSHA1": "V3Sy7+JY2PVw3EkfajS4DxCDBg8=", "path": "github.com/go-xorm/xorm", - "revision": "c360c20aa58a6dec86084967e93f673c57278da1", - "revisionTime": "2017-01-20T02:12:06Z" + "revision": "57bcb65078410bcd5c7c8ee52d7494e7b5146a04", + "revisionTime": "2017-01-22T09:17:55Z" }, { "checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=", |