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

Ensure correct ordering with same-compare values

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2018-04-24 13:54:12 +01:00
parent 11a9fa05e6
commit add47a5ada
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
db/select_test.go
View file

@ -145,7 +145,7 @@ func TestSelect(t *testing.T) {
CREATE person:a SET name="Tobias"; CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana"; CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b; CREATE person:c SET name="Jonathan", father=person:a, mother=person:b;
SELECT name, father, mother FROM person ORDER BY meta.id; SELECT meta, name, father, mother FROM person ORDER BY meta.id;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -171,7 +171,7 @@ func TestSelect(t *testing.T) {
CREATE person:a SET name="Tobias"; CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana"; CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b; 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; SELECT meta, name, father.* AS father, mother.* AS mother FROM person ORDER BY meta.id;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -211,7 +211,7 @@ func TestSelect(t *testing.T) {
CREATE person:a SET name="Tobias"; CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana"; CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b; 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; SELECT meta, name, father.id AS father, mother.id AS mother FROM person ORDER BY meta.id;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -237,7 +237,7 @@ func TestSelect(t *testing.T) {
CREATE person:a SET name="Tobias"; CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana"; CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b; 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; SELECT meta, name, father.name AS father, mother.name AS mother FROM person ORDER BY meta.id;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -263,7 +263,7 @@ func TestSelect(t *testing.T) {
CREATE person:a SET name="Tobias"; CREATE person:a SET name="Tobias";
CREATE person:b SET name="Silvana"; CREATE person:b SET name="Silvana";
CREATE person:c SET name="Jonathan", father=person:a, mother=person:b; 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; SELECT meta, name, father.id.name AS father, mother.id.name AS mother FROM person ORDER BY meta.id;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)
@ -1278,7 +1278,7 @@ func TestSelect(t *testing.T) {
}) })
Convey("Group and retrieve more than 1000 records to test incremental processing", t, func() { Convey("Group and retrieve more than 10000 records to test incremental processing", t, func() {
setupDB() setupDB()
@ -1437,7 +1437,7 @@ func TestSelect(t *testing.T) {
}) })
Convey("Order records with collation and numeric sorting using unicode definition", t, func() { Convey("Order records with collation and numeric and insensitive sorting using unicode definition", t, func() {
setupDB() setupDB()
@ -1452,7 +1452,7 @@ func TestSelect(t *testing.T) {
UPDATE person:4 SET test = "1000"; UPDATE person:4 SET test = "1000";
UPDATE person:6 SET test = "2"; UPDATE person:6 SET test = "2";
UPDATE person:8 SET test = null; UPDATE person:8 SET test = null;
SELECT test FROM person ORDER BY test COLLATE 'en-GB-u-kn-true' ASC; SELECT test FROM person ORDER BY test COLLATE 'en-GB-u-kn-true-kc-false' ASC;
` `
res, err := Execute(setupKV(), txt, nil) res, err := Execute(setupKV(), txt, nil)

3
sql/string.go
View file

@ -521,9 +521,10 @@ func (this Orders) String() string {
} }
func (this Order) String() string { func (this Order) String() string {
return print("%v %v", return print("%v %v%v",
this.Expr, this.Expr,
maybe(this.Dir, "ASC", "DESC"), maybe(this.Dir, "ASC", "DESC"),
maybe(!this.Tag.IsRoot(), print(" COLLATE %s", this.Tag.String())),
) )
} }

7
util/comp/comp.go
View file

@ -124,7 +124,12 @@ func Comp(a, b interface{}, expr *sql.Order) int {
if expr.Tag.IsRoot() { if expr.Tag.IsRoot() {
return strings.Compare(x, y) return strings.Compare(x, y)
} else { } else {
c := collate.New(expr.Tag, collate.OptionsFromTag(expr.Tag), collate.Loose) c := collate.New(
expr.Tag,
collate.Loose,
collate.Force,
collate.OptionsFromTag(expr.Tag),
)
return c.CompareString(x, y) return c.CompareString(x, y)
} }
} }