Skip to content

Fix timescaledb query (missing parenthesis). #169

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
majst01 merged 2 commits into from
Feb 28, 2025
Merged

Fix timescaledb query (missing parenthesis). #169

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
8414a11
Fix timescaledb query (missing paranthesis).
Gerrit91 Feb 28, 2025
9c99881
Cleanup tt.
Gerrit91 Feb 28, 2025
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 auditing/timescaledb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (a *timescaleAuditing) Search(ctx context.Context, filter EntryFilter) ([]E
where = append(where, fmt.Sprintf("entry ->> '%s' like '%%' || :%s || '%%'", field, field))
case phrase:
// the additional "like" match allows matching partial words, too
where = append(where, fmt.Sprintf("ts @@ websearch_to_tsquery('simple', '$$' || :%s || '$$') or entry ->> '%s' like '%%' || :%s || '%%'", field, field, field))
where = append(where, fmt.Sprintf("(ts @@ websearch_to_tsquery('simple', '$$' || :%s || '$$') or entry ->> '%s' like '%%' || :%s || '%%')", field, field, field))
default:
return fmt.Errorf("comp op not known")
}
Expand Down
30 changes: 28 additions & 2 deletions auditing/timescaledb_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,36 @@ func TestAuditing_TimescaleDB(t *testing.T) {
require.Len(t, entries, len(testEntries()))
},
},
{
name: "filter on query does not affect other filters",
t: func(t *testing.T, a Auditing) {
es := testEntries()
for _, e := range es {
err := a.Index(e)
require.NoError(t, err)
}

err := a.Flush()
require.NoError(t, err)

entries, err := a.Search(ctx, EntryFilter{
From: now.Add(-1 * time.Minute),
To: now.Add(1 * time.Minute),
RequestId: "00000000-0000-0000-0000-000000000000",
Phase: "response",
Path: "/v1/test/0",
Body: "00000000",
})
require.NoError(t, err)
require.Len(t, entries, 1)

if diff := cmp.Diff(entries[0], es[0]); diff != "" {
t.Errorf("diff (+got -want):\n %s", diff)
}
},
},
}
for i, tt := range tests {
tt := tt

t.Run(fmt.Sprintf("%d %s", i, tt.name), func(t *testing.T) {
defer func() {
a := auditing.(*timescaleAuditing)
Expand Down