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

Ensure nil fields are removed when SCHEMAFULL

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2017-12-05 10:13:56 +00:00
parent ccdc6fb8ea
commit 6e8fdaa2db
3 changed files with 72 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
db/define_test.go
View file

@ -17,6 +17,7 @@ package db
import (
"testing"
"github.com/abcum/surreal/sql"
"github.com/abcum/surreal/util/data"
. "github.com/smartystreets/goconvey/convey"
)
@ -113,8 +114,64 @@ func TestDefine(t *testing.T) {
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 4)
So(data.Consume(res[3].Result[0]).Get("test").Data(), ShouldEqual, true)
So(data.Consume(res[3].Result[0]).Get("other").Data(), ShouldEqual, nil)
So(data.Consume(res[3].Result[0]).Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"tb": "person",
"id": "test",
},
"test": true,
})
})
Convey("Define a schemafull table with nil values", t, func() {
setupDB()
txt := `
USE NS test DB test;
DEFINE TABLE person SCHEMAFULL;
DEFINE FIELD test ON person TYPE boolean;
UPDATE @person:test SET test=true, other=NULL;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 4)
So(data.Consume(res[3].Result[0]).Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"tb": "person",
"id": "test",
},
"test": true,
})
})
Convey("Define a schemafull table with nested records", t, func() {
setupDB()
txt := `
USE NS test DB test;
DEFINE TABLE person SCHEMAFULL;
DEFINE FIELD test ON person TYPE record (person);
UPDATE @person:test SET test=person:other;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 4)
So(data.Consume(res[3].Result[0]).Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"tb": "person",
"id": "test",
},
"test": &sql.Thing{"person", "other"},
})
})
@ -127,13 +184,23 @@ func TestDefine(t *testing.T) {
DEFINE TABLE person SCHEMAFULL;
DEFINE FIELD test ON person TYPE array;
DEFINE FIELD test.* ON person TYPE record (person);
UPDATE @person:test SET test=[], test+=person:1, test+=person:2;
UPDATE @person:test SET test=[], test+=person:one, test+=person:two;
`
res, err := Execute(setupKV(), txt, nil)
So(err, ShouldBeNil)
So(res, ShouldHaveLength, 5)
So(data.Consume(res[4].Result[0]).Get("test").Data(), ShouldHaveLength, 2)
So(data.Consume(res[4].Result[0]).Data(), ShouldResemble, map[string]interface{}{
"id": &sql.Thing{"person", "test"},
"meta": map[string]interface{}{
"tb": "person",
"id": "test",
},
"test": []interface{}{
&sql.Thing{"person", "one"},
&sql.Thing{"person", "two"},
},
})
})

4
util/data/data.go
View file

@ -959,10 +959,6 @@ func (d *Doc) Each(exec Iterator) error {
func (d *Doc) each(exec Iterator, prev []string) error {
if d.data == nil {
return nil
}
// Define the temporary object so
// that we can loop over and traverse
// down the path parts of the data

2
util/data/data_test.go
View file

@ -71,7 +71,7 @@ func TestOperations(t *testing.T) {
i++
return nil
})
So(i, ShouldEqual, 0)
So(i, ShouldEqual, 1)
})
// ----------------------------------------------------------------------