vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-14 00:39:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for free-text search and minor bug fixes in netquery

Browse source
This commit is contained in:
Patrick Pacher 2022-05-17 08:59:18 +02:00
parent bef911e925
commit 15f85b5ae9
No known key found for this signature in database
GPG key ID: E8CD2DA160925A6D
6 changed files with 109 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
netquery/query_handler.go
View file

@ -152,7 +152,7 @@ func (req *QueryRequestPayload) generateSQL(ctx context.Context, schema *orm.Tab
orm.DefaultEncodeConfig,
)
if err != nil {
return "", nil, fmt.Errorf("ganerating where clause: %w", err)
return "", nil, fmt.Errorf("generating where clause: %w", err)
}
if req.paramMap == nil {
@ -163,8 +163,24 @@ func (req *QueryRequestPayload) generateSQL(ctx context.Context, schema *orm.Tab
req.paramMap[key] = val
}
// build the actual SQL query statement
// FIXME(ppacher): add support for group-by and sort-by
if req.TextSearch != nil {
textClause, textParams, err := req.TextSearch.toSQLConditionClause(ctx, schema, "", orm.DefaultEncodeConfig)
if err != nil {
return "", nil, fmt.Errorf("generating text-search clause: %w", err)
}
if textClause != "" {
if whereClause != "" {
whereClause += " AND "
}
whereClause += textClause
for key, val := range textParams {
req.paramMap[key] = val
}
}
}
groupByClause, err := req.generateGroupByClause(schema)
if err != nil {