From 15ea65a61d89704ab252012efb59ae5e32f81170 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 14 Feb 2019 13:45:38 +0100 Subject: [PATCH] Fix database/query issue --- database/query/query.go | 4 ++-- database/query/query_test.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/database/query/query.go b/database/query/query.go index d9ecb7f..88f7f5c 100644 --- a/database/query/query.go +++ b/database/query/query.go @@ -125,8 +125,8 @@ func (q *Query) MatchesAccessor(acc accessor.Accessor) bool { // Matches checks whether the query matches the supplied database record. func (q *Query) Matches(r record.Record) bool { - if q.MatchesKey(r.DatabaseKey()) { - return true + if !q.MatchesKey(r.DatabaseKey()) { + return false } return q.MatchesRecord(r) } diff --git a/database/query/query_test.go b/database/query/query_test.go index 4645a61..1730381 100644 --- a/database/query/query_test.go +++ b/database/query/query_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/Safing/portbase/database/record" + "github.com/Safing/portbase/formats/dsd" ) var ( @@ -65,7 +66,7 @@ func TestQuery(t *testing.T) { // if !gjson.Valid(testJSON) { // t.Fatal("test json is invalid") // } - r, err := record.NewWrapper("", nil, append([]byte("J"), []byte(testJSON)...)) + r, err := record.NewWrapper("", nil, dsd.JSON, []byte(testJSON)) if err != nil { t.Fatal(err) }