Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

修复GroupBy操作时，Count() 返回错误的问题 #1169

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

修复GroupBy操作时，Count() 返回错误的问题 #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
42cf4fa
RawCols generate raw "col1, col2, group_concat(col3)" statement
Oct 13, 2018
f574d3c
Merge branch 'master' into master
jiangyanfeng Oct 17, 2018
9b50e3b
fix Count error when have Select statement
Dec 8, 2018
17b4800
Merge branch 'master' of https://github.com/jiangyanfeng/xorm
Dec 8, 2018
f5e3392
remove RawCols, use Select instead
Dec 8, 2018
59c71c5
Merge branch 'master' into master
jiangyanfeng Dec 8, 2018
bd36dab
try to fix testEngine.Select undefined error
Dec 8, 2018
d0e27ef
Merge branch 'master' of https://github.com/jiangyanfeng/xorm
Dec 8, 2018
1537cf3
Merge branch 'master' into master
jiangyanfeng Dec 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions session_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ func (session *Session) Count(bean ...interface{}) (int64, error) {
args = session.statement.RawParams
}

if len(session.statement.selectStr) > 0 {
sqlStr = "SELECT COUNT(*) FROM ("+sqlStr+") _TEMP_"
}

var total int64
err = session.queryRow(sqlStr, args...).Scan(&total)
if err == sql.ErrNoRows || err == nil {
Expand Down
4 changes: 4 additions & 0 deletions session_stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,10 @@ func TestCount(t *testing.T) {
assert.NoError(t, err)
assert.EqualValues(t, 1, cnt)

total, err = testEngine.Where(cond).Select(colName).Count(new(UserinfoCount))
assert.NoError(t, err)
assert.EqualValues(t, 1, total)

total, err = testEngine.Where(cond).Count(new(UserinfoCount))
assert.NoError(t, err)
assert.EqualValues(t, 1, total)
Expand Down