Skip to content

Prevent panic when running nil/empty search queries against Postgres #1236

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

Merged
rhybrillou merged 2 commits into from
Apr 8, 2022
Merged

Prevent panic when running nil/empty search queries against Postgres #1236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f38eea
Prevent panic when running nil/empty search queries against Postgres
rhybrillou Apr 8, 2022
30feb69
Add test for nil search query
rhybrillou Apr 8, 2022
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
2 changes: 1 addition & 1 deletion pkg/search/postgres/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func standardizeQueryAndPopulatePath(q *v1.Query, optionsMap searchPkg.OptionsMa

fromClause := stringutils.JoinNonEmpty(", ", froms...)
selQuery := generateSelectFields(queryEntry, schema.LocalPrimaryKeys(), selectType)
pagination, err := getPaginationQuery(q.Pagination, schema, dbFields)
pagination, err := getPaginationQuery(q.GetPagination(), schema, dbFields)
if err != nil {
return nil, err
}
Expand Down
12 changes: 12 additions & 0 deletions pkg/search/postgres/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@ func TestMultiTableQueries(t *testing.T) {
Data: []interface{}{"central%"},
},
},
{
desc: "nil query",
q: nil,
expected: &query{
Select: selectQuery{
Query: "select deployments.Id",
},
From: "deployments",
Where: "",
Data: []interface{}{},
},
},
} {
t.Run(c.desc, func(t *testing.T) {
actual, err := standardizeQueryAndPopulatePath(c.q, mappings.OptionsMap, deploymentBaseSchema, GET)
Expand Down