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.

Commit bffab25

Browse files
committed
fix bug when buffersize with iterate
1 parent 57a7e44 commit bffab25

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

session_iterate.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ func (session *Session) BufferSize(size int) *Session {
6060
}
6161

6262
func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
63-
if session.isAutoClose {
64-
defer session.Close()
65-
}
66-
6763
var bufferSize = session.statement.bufferSize
6864
var limit = session.statement.LimitN
6965
if limit > 0 && bufferSize > limit {
@@ -73,6 +69,11 @@ func (session *Session) bufferIterate(bean interface{}, fun IterFunc) error {
7369
v := rValue(bean)
7470
sliceType := reflect.SliceOf(v.Type())
7571
var idx = 0
72+
session.autoResetStatement = false
73+
defer func() {
74+
session.autoResetStatement = true
75+
}()
76+
7677
for {
7778
slice := reflect.New(sliceType)
7879
if err := session.Limit(bufferSize, start).find(slice.Interface(), bean); err != nil {

session_iterate_test.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,15 @@ func TestBufferIterate(t *testing.T) {
8989
})
9090
assert.NoError(t, err)
9191
assert.EqualValues(t, 7, cnt)
92+
93+
cnt = 0
94+
err = testEngine.Where("id <= 10").BufferSize(2).Iterate(new(UserBufferIterate), func(i int, bean interface{}) error {
95+
user := bean.(*UserBufferIterate)
96+
assert.EqualValues(t, cnt+1, user.Id)
97+
assert.EqualValues(t, true, user.IsMan)
98+
cnt++
99+
return nil
100+
})
101+
assert.NoError(t, err)
102+
assert.EqualValues(t, 10, cnt)
92103
}

0 commit comments

Comments
 (0)