public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-15 12:33:45 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update xorm to latest version and fix correct user table referencing in sql (#4473) (#4483)

Browse Source
This commit is contained in:
Lauris BH
2018-07-20 21:48:15 +03:00
committed by GitHub
parent 88d791013b
commit 8a639ade58
49 changed files with 1718 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/go-xorm/xorm/rows.go generated vendored
View File

@@ -32,7 +32,7 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
var args []interface{}
var err error
if err = rows.session.statement.setRefValue(rValue(bean)); err != nil {
if err = rows.session.statement.setRefBean(bean); err != nil {
return nil, err
}
@@ -94,8 +94,7 @@ func (rows *Rows) Scan(bean interface{}) error {
return fmt.Errorf("scan arg is incompatible type to [%v]", rows.beanType)
}
dataStruct := rValue(bean)
if err := rows.session.statement.setRefValue(dataStruct); err != nil {
if err := rows.session.statement.setRefBean(bean); err != nil {
return err
}
@@ -104,6 +103,7 @@ func (rows *Rows) Scan(bean interface{}) error {
return err
}
dataStruct := rValue(bean)
_, err = rows.session.slice2Bean(scanResults, rows.fields, bean, &dataStruct, rows.session.statement.RefTable)
if err != nil {
return err