noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable select * data from a foreign thing / record

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2018-03-18 21:33:26 +00:00
parent ca392f87a7
commit ad4adbd986
3 changed files with 217 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
db/fetch.go
View file

@ -245,6 +245,8 @@ func (e *executor) fetchPaths(ctx context.Context, doc *data.Doc, exprs ...sql.E
} }
case *sql.PartExpression: case *sql.PartExpression:
switch val := val.Part.(type) { switch val := val.Part.(type) {
case *sql.All:
return e.fetchPaths(ctx, doc, exprs...)
case *sql.Param: case *sql.Param:
res, err := e.fetch(ctx, val, doc) res, err := e.fetch(ctx, val, doc)
if err != nil { if err != nil {

207
db/select_test.go
View file

@ -136,6 +136,150 @@ func TestSelect(t *testing.T) {
}) })
Convey("Select records with an embedded record field", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father, mother FROM person ORDER BY meta.id;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("name").Data(), ShouldEqual, "Tobias")
So(data.Consume(res[4].Result[1]).Get("name").Data(), ShouldEqual, "Silvana")
So(data.Consume(res[4].Result[2]).Get("name").Data(), ShouldEqual, "Jonathan")
So(data.Consume(res[4].Result[2]).Get("father").Data(), ShouldResemble, &sql.Thing{"person", "a"})
So(data.Consume(res[4].Result[2]).Get("mother").Data(), ShouldResemble, &sql.Thing{"person", "b"})
})
Convey("Select '*' parameter from an embedded record field fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father.* AS father, mother.* AS mother FROM person ORDER BY meta.id;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("name").Data(), ShouldEqual, "Tobias")
So(data.Consume(res[4].Result[1]).Get("name").Data(), ShouldEqual, "Silvana")
So(data.Consume(res[4].Result[2]).Get("name").Data(), ShouldEqual, "Jonathan")
So(data.Consume(res[4].Result[2]).Get("father").Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "a"},
"meta": map[string]interface{}{
"id": "a",
"tb": "person",
},
"name": "Tobias",
})
So(data.Consume(res[4].Result[2]).Get("mother").Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "b"},
"meta": map[string]interface{}{
"id": "b",
"tb": "person",
},
"name": "Silvana",
})
})
Convey("Select 'id' parameter from an embedded record field fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father.id AS father, mother.id AS mother FROM person ORDER BY meta.id;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("name").Data(), ShouldEqual, "Tobias")
So(data.Consume(res[4].Result[1]).Get("name").Data(), ShouldEqual, "Silvana")
So(data.Consume(res[4].Result[2]).Get("name").Data(), ShouldEqual, "Jonathan")
So(data.Consume(res[4].Result[2]).Get("father").Data(), ShouldResemble, &sql.Thing{"person", "a"})
So(data.Consume(res[4].Result[2]).Get("mother").Data(), ShouldResemble, &sql.Thing{"person", "b"})
})
Convey("Select 'name' parameter from an embedded record field fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father.name AS father, mother.name AS mother FROM person ORDER BY meta.id;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("name").Data(), ShouldEqual, "Tobias")
So(data.Consume(res[4].Result[1]).Get("name").Data(), ShouldEqual, "Silvana")
So(data.Consume(res[4].Result[2]).Get("name").Data(), ShouldEqual, "Jonathan")
So(data.Consume(res[4].Result[2]).Get("father").Data(), ShouldResemble, "Tobias")
So(data.Consume(res[4].Result[2]).Get("mother").Data(), ShouldResemble, "Silvana")
})
Convey("Select 'id.name' parameter from an embedded record field fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father.id.name AS father, mother.id.name AS mother FROM person ORDER BY meta.id;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("name").Data(), ShouldEqual, "Tobias")
So(data.Consume(res[4].Result[1]).Get("name").Data(), ShouldEqual, "Silvana")
So(data.Consume(res[4].Result[2]).Get("name").Data(), ShouldEqual, "Jonathan")
So(data.Consume(res[4].Result[2]).Get("father").Data(), ShouldResemble, "Tobias")
So(data.Consume(res[4].Result[2]).Get("mother").Data(), ShouldResemble, "Silvana")
})
Convey("Select records using variable for a `table`", t, func() { Convey("Select records using variable for a `table`", t, func() {
setupDB() setupDB()
@ -384,6 +528,36 @@ func TestSelect(t *testing.T) {
}) })
Convey("Select '*' from a direct `thing` record fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
CREATE tester:test;
CREATE person:test SET name="Tobias";
SELECT *, person:test.* AS test FROM tester;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 4)
So(res[1].Result, ShouldHaveLength, 1)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(data.Consume(res[3].Result[0]).Get("meta.tb").Data(), ShouldEqual, "tester")
So(data.Consume(res[3].Result[0]).Get("meta.id").Data(), ShouldEqual, "test")
So(data.Consume(res[3].Result[0]).Get("test").Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"id": "test",
"tb": "person",
},
"name": "Tobias",
})
})
Convey("Select 'id' parameter from a direct `thing` record fetch", t, func() { Convey("Select 'id' parameter from a direct `thing` record fetch", t, func() {
setupDB() setupDB()
@ -485,7 +659,7 @@ func TestSelect(t *testing.T) {
LET person = person:test; LET person = person:test;
CREATE tester:test; CREATE tester:test;
CREATE person:test SET name="Tobias"; CREATE person:test SET name="Tobias";
SELECT *, $person.id AS test FROM tester; SELECT *, $person AS test FROM tester;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -500,6 +674,37 @@ func TestSelect(t *testing.T) {
}) })
Convey("Select '*' parameter from a direct `param` record fetch", t, func() {
setupDB()
txt := `
USE NS test DB test;
LET person = person:test;
CREATE tester:test;
CREATE person:test SET name="Tobias";
SELECT *, $person.* AS test FROM tester;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(res[2].Result, ShouldHaveLength, 1)
So(res[3].Result, ShouldHaveLength, 1)
So(res[4].Result, ShouldHaveLength, 1)
So(data.Consume(res[4].Result[0]).Get("meta.tb").Data(), ShouldEqual, "tester")
So(data.Consume(res[4].Result[0]).Get("meta.id").Data(), ShouldEqual, "test")
So(data.Consume(res[4].Result[0]).Get("test").Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"id": "test",
"tb": "person",
},
"name": "Tobias",
})
})
Convey("Select 'id' parameter from a direct `param` record fetch", t, func() { Convey("Select 'id' parameter from a direct `param` record fetch", t, func() {
setupDB() setupDB()

13
util/data/data.go
View file

@ -491,10 +491,15 @@ func (d *Doc) Get(path ...string) *Doc {
// to the next part of the path // to the next part of the path
if m, ok := object.(map[string]interface{}); ok { if m, ok := object.(map[string]interface{}); ok {
if d.call != nil && len(path[k+1:]) > 0 { switch p {
object = d.call(p, m[p]) default:
} else { if d.call != nil && len(path[k+1:]) > 0 {
object = m[p] object = d.call(p, m[p])
} else {
object = m[p]
}
case "*":
object = m
} }
continue continue
} }