diff --git a/internal/sqladapter/testing/adapter.go.tpl b/internal/sqladapter/testing/adapter.go.tpl
index 327179960ac867cba9b7110f440600e4304032de..d41012ea791b765495c9d0305053ba989c462d27 100644
--- a/internal/sqladapter/testing/adapter.go.tpl
+++ b/internal/sqladapter/testing/adapter.go.tpl
@@ -1139,8 +1139,6 @@ func TestBatchInsertReturningKeys(t *testing.T) {
 		ID int `db:"id"`
 	}
 	for batch.Next(&keyMap) {
-		assert.NoError(t, err)
-
 		// Each insertion must produce new keys.
 		assert.True(t, len(keyMap) > 0)
 		assert.True(t, len(keyMap) <= batchSize)
diff --git a/lib/sqlbuilder/batch.go b/lib/sqlbuilder/batch.go
index 1148c8a75517ecf42c78b0912837caf172438a04..c61b3510b7e289e35e3f8b2a75b21f5a8caf27f0 100644
--- a/lib/sqlbuilder/batch.go
+++ b/lib/sqlbuilder/batch.go
@@ -25,7 +25,7 @@ func (b *BatchInserter) Next(dst interface{}) bool {
 	for value := range b.Values {
 		i++
 		clone.Values(value)
-		if b.size == i {
+		if i == b.size {
 			break
 		}
 	}