github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Research on possible history module implementation using sqlite ATTACH DATABASE

Browse Source
This commit is contained in:
Patrick Pacher
2023-06-14 09:38:25 +02:00
committed by Daniel
parent 45117c630f
commit e9e9b54364
3 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netquery/query_handler.go
View File

@@ -190,7 +190,7 @@ func (req *QueryRequestPayload) generateSQL(ctx context.Context, schema *orm.Tab
}
selectClause := req.generateSelectClause()
query := `SELECT ` + selectClause + ` FROM connections`
query := `SELECT ` + selectClause + ` FROM ( SELECT *, 'memory' as _source FROM main.connections UNION SELECT *, 'history' as _source FROM history.connections) `
if whereClause != "" {
query += " WHERE " + whereClause
}
@@ -298,7 +298,8 @@ func (req *QueryRequestPayload) generateGroupByClause(schema *orm.TableSchema) (
func (req *QueryRequestPayload) generateSelectClause() string {
selectClause := "*"
if len(req.selectedFields) > 0 {
selectClause = strings.Join(req.selectedFields, ", ")
selectedFields := append(req.selectedFields, "_source")
selectClause = strings.Join(selectedFields, ", ")
}
return selectClause