Skip to content
Snippets Groups Projects
Commit 964cf101 authored by Danis Kirasirov's avatar Danis Kirasirov
Browse files

Правки

parent 4d94ec48
No related branches found
No related tags found
No related merge requests found
......@@ -41,15 +41,6 @@ func TestIsExpression(t *testing.T) {
{"time", fmt.Sprintf("d > Time.Time('%s')", now.Format(time.RFC3339)), true},
{"in", "In(s, [1,2,3])", true},
{"in", "In(s, 1)", true},
{"exists#1", "exists(s)", true},
{"exists#2", "exists", false},
{"len#1", "len(s) == 1", true},
{"len#2", "len(s) != 1", true},
{"len#3", "len(s) > 1", true},
{"len#4", "len(s) >= 1", true},
{"len#5", "len(s) < 1", true},
{"len#6", "len(s) <= 1", true},
{"len#7", "len", false},
{"text search or id", "id", false},
{"numbers", "3", false},
}
......
......@@ -414,10 +414,7 @@ func (c *compiler) CallNode(node *ast.CallNode) interface{} {
panic("exists() expects exactly 1 argument")
}
field := c.identifier(node.Arguments[0])
return bson.M{"$or": bson.A{
bson.M{field: bson.M{"$exists": true, "$type": "array"}},
bson.M{field: bson.M{"$ne": nil}},
}}
return bson.M{field: bson.M{"$exists": true}}
case "icontains":
v := c.identifier(node.Arguments[0])
......
......@@ -30,7 +30,7 @@ func TestConvertToMongo(t *testing.T) {
{"equal", "s == 3", nil, bson.M{"s": 3}, false},
{"in array", "s in [1,2,3]", nil, bson.M{"s": bson.M{"$in": []interface{}{1, 2, 3}}}, false},
{"not in array", "s not in [1,2,3]", nil, bson.M{"s": bson.M{"$nin": []interface{}{1, 2, 3}}}, false},
{"exists#1", "exists(s)", nil, bson.M{"$or": bson.A{bson.M{"s": bson.M{"$exists": true, "$type": "array"}}, bson.M{"s": bson.M{"$ne": nil}}}}, false},
{"exists#1", "exists(s)", nil, bson.M{"s": bson.M{"$exists": true}}, false},
{"exists#2", "exists(s, s)", nil, nil, true},
{"len#1", "len(s)", nil, nil, true},
{"len#2", "len(s) <> 1", nil, nil, true},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment