xorm/xorm
xorm/xorm
63
356
Fork 204
Code Issues 369 Pull Requests 16 Actions Releases 35 Activity

Fix find and count bug with cols #1826

Merged
lunny merged 1 commits from lunny/fix_find_and_count_cols into master 2020-11-09 04:23:14 +00:00
Conversation 0 Commits 1 Files Changed 2 +10
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
integrations/session_find_test.go
View File

@ -552,6 +552,13 @@ func TestFindAndCountOneFunc(t *testing.T) {
assert.EqualValues(t, 1, len(results))
assert.EqualValues(t, 1, cnt)
results = make([]FindAndCountStruct, 0, 1)
cnt, err = testEngine.Where("msg = ?", true).Cols("id", "content", "msg").
Limit(1).FindAndCount(&results)
assert.NoError(t, err)
assert.EqualValues(t, 1, len(results))
assert.EqualValues(t, 1, cnt)
results = make([]FindAndCountStruct, 0, 1)
cnt, err = testEngine.Where("msg = ?", true).Desc("id").
Limit(1).Cols("content").FindAndCount(&results)

3
session_find.go
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 = ""
}