fix: fix ignored scanner.Err() (#4063)

zeromicro · Apr 10, 2024 · 682460c · 682460c
1 parent a66ae0d
commit 682460c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/core/stores/sqlx/orm.go b/core/stores/sqlx/orm.go
@@ -248,7 +248,7 @@ func unmarshalRows(v any, scanner rowsScanner, strict bool) error {
 			return ErrUnsupportedValueType
 		}
 
-		return nil
+		return scanner.Err()
 	default:
 		return ErrUnsupportedValueType
 	}

diff --git a/core/stores/sqlx/stmt_test.go b/core/stores/sqlx/stmt_test.go
@@ -291,19 +291,19 @@ func TestStmtBreaker(t *testing.T) {
 	})
 }
 
-func TestQueryScanTimeout(t *testing.T) {
+func TestQueryRowsScanTimeout(t *testing.T) {
 	dbtest.RunTest(t, func(db *sql.DB, mock sqlmock.Sqlmock) {
-		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond)
-		defer cancel()
-		row := sqlmock.NewRows([]string{"foo"})
+		rows := sqlmock.NewRows([]string{"foo"})
 		for i := 0; i < 10000; i++ {
-			row = row.AddRow("bar" + strconv.Itoa(i))
+			rows = rows.AddRow("bar" + strconv.Itoa(i))
 		}
+		mock.ExpectQuery("any").WillReturnRows(rows)
 		var val []struct {
-			Foo int
-			Bar string
+			Foo string
 		}
 		conn := NewSqlConnFromDB(db)
+		ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond)
+		defer cancel()
 		err := conn.QueryRowsCtx(ctx, &val, "any")
 		assert.ErrorIs(t, err, context.DeadlineExceeded)
 	})