fix(tibuild): fix sql

Signed-off-by: wuhuizuo <wuhuizuo@126.com>
PingCAP-QE · May 21, 2024 · 8b7b398 · 8b7b398
1 parent c4a966c
commit 8b7b398
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/tibuild/pkg/rest/repo/dev_build_repo.go b/tibuild/pkg/rest/repo/dev_build_repo.go
@@ -52,22 +52,22 @@ func (m DevBuildRepo) Update(ctx context.Context, id int, req DevBuild) (resp *D
 	return &req, nil
 }
 
-func (m DevBuildRepo) List(ctx context.Context, option DevBuildListOption) (resp []DevBuild, err error) {
+func (m DevBuildRepo) List(ctx context.Context, option DevBuildListOption) (resp []*DevBuild, err error) {
 	db := m.Db.Order("created_at DESC").Offset(int(option.Offset)).Limit(int(option.Size))
 	if option.Hotfix != nil {
-		db = db.Where(&DevBuild{Spec: DevBuildSpec{IsHotfix: *option.Hotfix}}, *option.Hotfix)
+		db = db.Where(&DevBuild{Spec: DevBuildSpec{IsHotfix: *option.Hotfix}}, "IsHotfix")
 	}
 	if option.CreatedBy != nil && *option.CreatedBy != "" {
-		db = db.Where(&DevBuild{Meta: DevBuildMeta{CreatedBy: *option.CreatedBy}}, *option.CreatedBy)
+		db = db.Where(&DevBuild{Meta: DevBuildMeta{CreatedBy: *option.CreatedBy}}, "CreatedBy")
 	}
 
-	result := []DevBuild{}
+	result := []*DevBuild{}
 	if err := db.Find(&result).Error; err != nil {
 		return nil, fmt.Errorf("%s%w", err.Error(), ErrInternalError)
 	}
 
 	for i := range result {
-		err = outofDB(&result[i])
+		err = outofDB(result[i])
 		if err != nil {
 			return nil, err
 		}

diff --git a/tibuild/pkg/rest/repo/dev_build_repo_test.go b/tibuild/pkg/rest/repo/dev_build_repo_test.go
@@ -46,7 +46,8 @@ func TestDevBuildList(t *testing.T) {
 	require.NoError(t, err)
 	repo := DevBuildRepo{Db: odb}
 	rows := sqlmock.NewRows([]string{"id"}).AddRow(1).AddRow(2)
-	mock.ExpectQuery("SELECT \\* FROM `dev_builds`  WHERE  `dev_builds`.`is_hotfix` = \\? ORDER BY created_at DESC LIMIT 10 OFFSET 5").WithArgs(false).WillReturnRows(rows)
+	mock.ExpectQuery("SELECT \\* FROM `dev_builds`  WHERE  `dev_builds`.`is_hotfix` = \\? ORDER BY created_at DESC LIMIT \\? OFFSET \\?").
+		WithArgs(false, 10, 5).WillReturnRows(rows)
 	entities, err := repo.List(context.TODO(), DevBuildListOption{Offset: 5, Size: 10, Hotfix: &[]bool{false}[0]})
 	require.NoError(t, err)
 	require.Equal(t, 2, len(entities))