Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
IronPan committed Apr 5, 2019
1 parent 3a71136 commit c246ca1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
5 changes: 1 addition & 4 deletions backend/src/apiserver/storage/job_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,11 @@ func (s *JobStore) buildSelectJobsQuery(selectCount bool, opts *list.Options,
}

sqlBuilder := opts.AddFilterToSelect(filteredSelectBuilder)
sqlBuilder = opts.AddPaginationToSelect(filteredSelectBuilder)
if err != nil {
return "", nil, util.NewInternalServerError(err, "Failed to list jobs: %v", err)
}

// If we're not just counting, then also add select columns and perform a left join
// to get resource reference information. Also add pagination.
if !selectCount {
sqlBuilder = opts.AddPaginationToSelect(filteredSelectBuilder)
sqlBuilder = s.addResourceReferences(sqlBuilder)
sqlBuilder = opts.AddSortingToSelect(sqlBuilder)
}
Expand Down
5 changes: 1 addition & 4 deletions backend/src/apiserver/storage/run_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,11 @@ func (s *RunStore) buildSelectRunsQuery(selectCount bool, opts *list.Options,
}

sqlBuilder := opts.AddFilterToSelect(filteredSelectBuilder)
sqlBuilder = opts.AddPaginationToSelect(filteredSelectBuilder)
if err != nil {
return "", nil, util.NewInternalServerError(err, "Failed to list runs: %v", err)
}

// If we're not just counting, then also add select columns and perform a left join
// to get resource reference information. Also add pagination.
if !selectCount {
sqlBuilder = opts.AddPaginationToSelect(filteredSelectBuilder)
sqlBuilder = s.addMetricsAndResourceReferences(sqlBuilder)
sqlBuilder = opts.AddSortingToSelect(sqlBuilder)
}
Expand Down

0 comments on commit c246ca1

Please sign in to comment.