public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-10 15:32:55 +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/session_query.go generated vendored
View File

@@ -64,13 +64,17 @@ func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interfa
}
}
if err := session.statement.processIDParam(); err != nil {
return "", nil, err
}
condSQL, condArgs, err := builder.ToSQL(session.statement.cond)
if err != nil {
return "", nil, err
}
args := append(session.statement.joinArgs, condArgs...)
sqlStr, err := session.statement.genSelectSQL(columnStr, condSQL)
sqlStr, err := session.statement.genSelectSQL(columnStr, condSQL, true, true)
if err != nil {
return "", nil, err
}