domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

upgrade xorm to v1.0.6 (#14246)

Browse source
This commit is contained in:
Lunny Xiao 2021-01-05 14:28:51 +08:00 • committed by GitHub
parent 8db0372a45
commit 126c9331d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 91 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
vendor/xorm.io/xorm/session_find.go generated vendored
View file

@ -57,6 +57,9 @@ func (session *Session) FindAndCount(rowsSlicePtr interface{}, condiBean ...inte
if session.statement.SelectStr != "" {
session.statement.SelectStr = ""
}
if len(session.statement.ColumnMap) > 0 {
session.statement.ColumnMap = []string{}
}
if session.statement.OrderStr != "" {
session.statement.OrderStr = ""
}