merger测试修改

ecodeclub · Mar 13, 2023 · a4e3c3c · a4e3c3c
1 parent 085981b
commit a4e3c3c
Show file tree

Hide file tree

Showing 7 changed files with 510 additions and 209 deletions.
diff --git a/internal/merger/batchmerger/merger.go b/internal/merger/batchmerger/merger.go
@@ -108,3 +108,8 @@ func (m *MergerRows) Close() error {
 func (m *MergerRows) Columns() ([]string, error) {
 	return m.rows[0].Columns()
 }
+
+// Err 等会实现
+func (m *MergerRows) Err() error {
+	return nil
+}
diff --git a/internal/merger/batchmerger/merger_test.go b/internal/merger/batchmerger/merger_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/ecodeclub/eorm/internal/errs"
+	"github.com/ecodeclub/eorm/internal/merger/internal/errs"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"

diff --git a/internal/merger/internal/errs/error.go b/internal/merger/internal/errs/error.go
@@ -20,9 +20,11 @@ import (
 )
 
 var (
-	ErrEmptySortColumns = errors.New("merger: 排序列为空")
-	ErrMergerEmptyRows  = errors.New("eorm: sql.Rows列表为空")
-	ErrMergerRowsIsNull = errors.New("eorm: sql.Rows列表中有元素为nil")
+	ErrEmptySortColumns  = errors.New("merger: 排序列为空")
+	ErrMergerEmptyRows   = errors.New("merger: sql.Rows列表为空")
+	ErrMergerRowsIsNull  = errors.New("merger: sql.Rows列表中有元素为nil")
+	ErrMergerScanNotNext = errors.New("merger:  Scan called without calling Next")
+	ErrMergerScanClosed  = errors.New("merger: Scan Rows Closed")
 )
 
 func NewRepeatSortColumn(column string) error {