From 0a5db0f2169306d54e18b9bacc6d19de468ea332 Mon Sep 17 00:00:00 2001
From: Danis Kirasirov <dbgbbu@gmail.com>
Date: Fri, 26 Jan 2024 20:35:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=D1=8B=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
=?UTF-8?q?=D0=B8=D0=B5=20not?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/expr/mongo.go | 2 +-
pkg/expr/mongo_test.go | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg/expr/mongo.go b/pkg/expr/mongo.go
index 303ec125..3cdbf045 100644
--- a/pkg/expr/mongo.go
+++ b/pkg/expr/mongo.go
@@ -214,7 +214,7 @@ func (c *compiler) UnaryNode(node *ast.UnaryNode) interface{} {
return bson.M{c.identifier(nodeIn.Left): bson.M{"$nin": c.eval(nodeIn.Right)}}
}
- return bson.M{"$not": c.compile(node.Node)}
+ return bson.M{"$nor": bson.A{c.compile(node.Node)}}
default:
panic(fmt.Sprintf("unknown operator (%v)", node.Operator))
}
diff --git a/pkg/expr/mongo_test.go b/pkg/expr/mongo_test.go
index 3e77e0d4..c8f8d4ba 100644
--- a/pkg/expr/mongo_test.go
+++ b/pkg/expr/mongo_test.go
@@ -52,6 +52,8 @@ func TestConvertToMongo(t *testing.T) {
{"iendsWith", "iendsWith(s, 'some')", nil, bson.M{"s": bson.M{"$regex": ".*some$", "$options": "i"}}, false},
{"iendsWith . + () $ {} ^", "iendsWith(s,'. + () $ {} ^')", nil, bson.M{"s": bson.M{"$regex": ".*\\. \\+ \\(\\) \\$ \\{\\} \\^$", "$options": "i"}}, false},
{"or", "s==2 || s > 10", nil, bson.M{"$or": bson.A{bson.M{"s": 2}, bson.M{"s": bson.M{"$gt": 10}}}}, false},
+ {"not#1", "not icontains(s, 'some')", nil, bson.M{"$nor":bson.A{bson.M{"s":bson.M{"$options":"i", "$regex":"some"}}}}, false},
+ {"not#2", "not (s.test > 3)", nil, bson.M{"$nor": bson.A{bson.M{"s.test": bson.M{"$gt": 3}}}}, false},
{"search", "search('some') || s > 10", nil, bson.M{"$or": bson.A{bson.M{"$text": bson.M{"$search": "some"}}, bson.M{"s": bson.M{"$gt": 10}}}}, false},
{"vars:or", "s== a + 2 || s > a + 10", map[string]interface{}{"a": 100}, bson.M{"$or": bson.A{bson.M{"s": 102}, bson.M{"s": bson.M{"$gt": 110}}}}, false},
{"near", "near(a, [55.5, 37.5], 1000)", map[string]interface{}{"a": []interface{}{55, 37}}, bson.M{"a.geometry": bson.M{"$near": bson.D{{Key: "$geometry", Value: map[string]interface{}{"coordinates": []interface{}{55.5, 37.5}, "type": "Point"}}, {Key: "$maxDistance", Value: 1000}}}}, false},
--
GitLab