Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix miscellaneous List API issue #90

Merged
merged 5 commits into from
Nov 6, 2018
Merged

fix miscellaneous List API issue #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
172ffdd
fix
IronPan Nov 6, 2018
2011380
Update job_store.go
IronPan Nov 6, 2018
4de0d64
Update run_store.go
IronPan Nov 6, 2018
b633f85
Update presubmit-tests.sh
IronPan Nov 6, 2018
926286f
Update job_store.go
IronPan Nov 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions backend/src/apiserver/storage/job_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ func (s *JobStore) queryJobTable(
return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v",
err.Error())
}

rows, err := s.db.Query(sql, args...)
if err != nil {
return nil, util.NewInternalServerError(err, "Failed to list jobs: %v",
Expand All @@ -91,7 +90,7 @@ func (s *JobStore) toFilteredQuery(selectBuilder sq.SelectBuilder, filterContext
if filterContext.ReferenceKey != nil {
selectBuilder = sq.Select("list_job.*").
From("resource_references AS rf").
LeftJoin(fmt.Sprintf("(%s) as list_job on list_job.UUID=rf.ResourceUUID", sql), args...).
Join(fmt.Sprintf("(%s) as list_job on list_job.UUID=rf.ResourceUUID", sql), args...).
Where(sq.And{
sq.Eq{"rf.ReferenceUUID": filterContext.ID},
sq.Eq{"rf.ReferenceType": filterContext.Type}})
Expand Down
3 changes: 1 addition & 2 deletions backend/src/apiserver/storage/run_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ func (s *RunStore) queryRunTable(
return nil, util.NewInternalServerError(err, "Failed to create query to list jobs: %v",
err.Error())
}

r, err := s.db.Query(sql, args...)
if err != nil {
return nil, util.NewInternalServerError(err, "Failed to list runs: %v", err.Error())
Expand All @@ -102,7 +101,7 @@ func (s *RunStore) toFilteredQuery(selectBuilder sq.SelectBuilder, filterContext
if filterContext.ReferenceKey != nil {
selectBuilder = sq.Select("list_run.*").
From("resource_references AS rf").
LeftJoin(fmt.Sprintf("(%s) as list_run on list_run.UUID=rf.ResourceUUID", sql), args...).
Join(fmt.Sprintf("(%s) as list_run on list_run.UUID=rf.ResourceUUID", sql), args...).
Where(sq.And{
sq.Eq{"rf.ReferenceUUID": filterContext.ID},
sq.Eq{"rf.ReferenceType": filterContext.Type}})
Expand Down