vikarti.anatra/safing-portbase
1
0
Fork 0
mirror of https://github.com/safing/portbase synced 2026-05-01 21:21:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Complete database MVP

Browse source
This commit is contained in:
Daniel 2018-09-14 11:59:30 +02:00
parent 2c70416873
commit ac13b73d65
12 changed files with 160 additions and 480 deletions
Download patch file Download diff file Expand all files Collapse all files

20
database/query/condition-no.go
View file

@ -1,20 +0,0 @@
package query
import (
"github.com/Safing/portbase/database/accessor"
)
type noCond struct {
}
func (c *noCond) complies(acc accessor.Accessor) bool {
return true
}
func (c *noCond) check() (err error) {
return nil
}
func (c *noCond) string() string {
return ""
}

40
database/query/query.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"strings"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/database/record"
)
@ -101,14 +102,10 @@ func (q *Query) MatchesKey(dbKey string) bool {
return true
}
// Matches checks whether the query matches the supplied data object.
func (q *Query) Matches(r record.Record) bool {
if !strings.HasPrefix(r.DatabaseKey(), q.dbKeyPrefix) {
return false
}
// MatchesRecord checks whether the query matches the supplied database record (value only).
func (q *Query) MatchesRecord(r record.Record) bool {
if q.where == nil {
return false
return true
}
acc := r.GetAccessor(r)
@ -118,14 +115,33 @@ func (q *Query) Matches(r record.Record) bool {
return q.where.complies(acc)
}
// MatchesAccessor checks whether the query matches the supplied accessor (value only).
func (q *Query) MatchesAccessor(acc accessor.Accessor) bool {
if q.where == nil {
return true
}
return q.where.complies(acc)
}
// 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
}
return q.MatchesRecord(r)
}
// Print returns the string representation of the query.
func (q *Query) Print() string {
where := q.where.string()
if where != "" {
if strings.HasPrefix(where, "(") {
where = where[1 : len(where)-1]
var where string
if q.where != nil {
where = q.where.string()
if where != "" {
if strings.HasPrefix(where, "(") {
where = where[1 : len(where)-1]
}
where = fmt.Sprintf(" where %s", where)
}
where = fmt.Sprintf(" where %s", where)
}
var orderBy string

67
database/query/query_test.go
View file

@ -3,7 +3,7 @@ package query
import (
"testing"
"github.com/Safing/portbase/database/accessor"
"github.com/Safing/portbase/database/record"
)
var (
@ -46,12 +46,12 @@ var (
}`
)
func testQuery(t *testing.T, acc accessor.Accessor, shouldMatch bool, condition Condition) {
func testQuery(t *testing.T, r record.Record, shouldMatch bool, condition Condition) {
q := New("test:").Where(condition).MustBeValid()
// fmt.Printf("%s\n", q.String())
// fmt.Printf("%s\n", q.Print())
matched := q.Matches(acc)
matched := q.Matches(r)
switch {
case !matched && shouldMatch:
t.Errorf("should match: %s", q.Print())
@ -65,36 +65,39 @@ func TestQuery(t *testing.T) {
// if !gjson.Valid(testJSON) {
// t.Fatal("test json is invalid")
// }
f := accessor.NewJSONAccessor(&testJSON)
r, err := record.NewWrapper("", nil, append([]byte("J"), []byte(testJSON)...))
if err != nil {
t.Fatal(err)
}
testQuery(t, f, true, Where("age", Equals, 100))
testQuery(t, f, true, Where("age", GreaterThan, uint8(99)))
testQuery(t, f, true, Where("age", GreaterThanOrEqual, 99))
testQuery(t, f, true, Where("age", GreaterThanOrEqual, 100))
testQuery(t, f, true, Where("age", LessThan, 101))
testQuery(t, f, true, Where("age", LessThanOrEqual, "101"))
testQuery(t, f, true, Where("age", LessThanOrEqual, 100))
testQuery(t, r, true, Where("age", Equals, 100))
testQuery(t, r, true, Where("age", GreaterThan, uint8(99)))
testQuery(t, r, true, Where("age", GreaterThanOrEqual, 99))
testQuery(t, r, true, Where("age", GreaterThanOrEqual, 100))
testQuery(t, r, true, Where("age", LessThan, 101))
testQuery(t, r, true, Where("age", LessThanOrEqual, "101"))
testQuery(t, r, true, Where("age", LessThanOrEqual, 100))
testQuery(t, f, true, Where("temperature", FloatEquals, 120.413))
testQuery(t, f, true, Where("temperature", FloatGreaterThan, 120))
testQuery(t, f, true, Where("temperature", FloatGreaterThanOrEqual, 120))
testQuery(t, f, true, Where("temperature", FloatGreaterThanOrEqual, 120.413))
testQuery(t, f, true, Where("temperature", FloatLessThan, 121))
testQuery(t, f, true, Where("temperature", FloatLessThanOrEqual, "121"))
testQuery(t, f, true, Where("temperature", FloatLessThanOrEqual, "120.413"))
testQuery(t, r, true, Where("temperature", FloatEquals, 120.413))
testQuery(t, r, true, Where("temperature", FloatGreaterThan, 120))
testQuery(t, r, true, Where("temperature", FloatGreaterThanOrEqual, 120))
testQuery(t, r, true, Where("temperature", FloatGreaterThanOrEqual, 120.413))
testQuery(t, r, true, Where("temperature", FloatLessThan, 121))
testQuery(t, r, true, Where("temperature", FloatLessThanOrEqual, "121"))
testQuery(t, r, true, Where("temperature", FloatLessThanOrEqual, "120.413"))
testQuery(t, f, true, Where("lastly.yay", SameAs, "final"))
testQuery(t, f, true, Where("lastly.yay", Contains, "ina"))
testQuery(t, f, true, Where("lastly.yay", StartsWith, "fin"))
testQuery(t, f, true, Where("lastly.yay", EndsWith, "nal"))
testQuery(t, f, true, Where("lastly.yay", In, "draft,final"))
testQuery(t, f, true, Where("lastly.yay", In, "final,draft"))
testQuery(t, r, true, Where("lastly.yay", SameAs, "final"))
testQuery(t, r, true, Where("lastly.yay", Contains, "ina"))
testQuery(t, r, true, Where("lastly.yay", StartsWith, "fin"))
testQuery(t, r, true, Where("lastly.yay", EndsWith, "nal"))
testQuery(t, r, true, Where("lastly.yay", In, "draft,final"))
testQuery(t, r, true, Where("lastly.yay", In, "final,draft"))
testQuery(t, f, true, Where("happy", Is, true))
testQuery(t, f, true, Where("happy", Is, "true"))
testQuery(t, f, true, Where("happy", Is, "t"))
testQuery(t, f, true, Not(Where("happy", Is, "0")))
testQuery(t, f, true, And(
testQuery(t, r, true, Where("happy", Is, true))
testQuery(t, r, true, Where("happy", Is, "true"))
testQuery(t, r, true, Where("happy", Is, "t"))
testQuery(t, r, true, Not(Where("happy", Is, "0")))
testQuery(t, r, true, And(
Where("happy", Is, "1"),
Not(Or(
Where("happy", Is, false),
@ -102,8 +105,8 @@ func TestQuery(t *testing.T) {
)),
))
testQuery(t, f, true, Where("happy", Exists, nil))
testQuery(t, r, true, Where("happy", Exists, nil))
testQuery(t, f, true, Where("created", Matches, "^2014-[0-9]{2}-[0-9]{2}T"))
testQuery(t, r, true, Where("created", Matches, "^2014-[0-9]{2}-[0-9]{2}T"))
}