go/condition
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] NewExpr 参数错误

Browse Source
This commit is contained in:
what 2024-05-09 10:21:15 +08:00
parent 16a90b0469
commit 37018837d1
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
condition_expr.go
View File

@ -260,11 +260,11 @@ func FieldSqlFn(fn, fnParam string) ExprOption {
}
}
func NewExpr(rResource, rField, token string, opts ...ExprOption) *ConditionExpr {
func NewExpr(rResource, rField string, opts ...ExprOption) *ConditionExpr {
expr := &ConditionExpr{
field: rField,
fieldResource: rResource,
token: token,
token: "",
tokenType: STRING,
operator: EQ,
ignoreEmptyParma: false,

20
engine/engine_test.go
View File

@ -25,10 +25,7 @@ func TestEngine(t *testing.T) {
cond1 := condition.New(condition.Describe("条件1"))
cond1.SetExpr(condition.NewExpr(
"TestTable", "age", "age",
condition.TokenType(condition.PARAM),
))
cond1.SetExpr(condition.NewExpr("TestTable", "age", condition.Token("age", condition.PARAM)))
engine.Case(cond1, func(data any, g req.GlobalParams) error {
t.Log("cond1", data)
@ -66,10 +63,7 @@ func TestRelationEngine(t *testing.T) {
}
cond1 := condition.New(condition.Describe("条件1")).
SetExpr(condition.NewExpr(
"TestTable", "age", "age",
condition.TokenType(condition.PARAM),
))
SetExpr(condition.NewExpr("TestTable", "age", condition.Token("age", condition.PARAM)))
engine.Case(cond1, func(data any, g req.GlobalParams) error {
t.Log("cond1", data)
@ -77,14 +71,8 @@ func TestRelationEngine(t *testing.T) {
})
cond2 := condition.New(condition.Type(condition.OR), condition.Describe("条件2")).
SetExpr(condition.NewExpr(
"TestTableA", "age", "age",
condition.TokenType(condition.PARAM),
)).
SetExpr(condition.NewExpr(
"TestTable", "age", "age",
condition.TokenType(condition.PARAM),
))
SetExpr(condition.NewExpr("TestTableA", "age", condition.Token("age", condition.PARAM))).
SetExpr(condition.NewExpr("TestTable", "age", condition.Token("age", condition.PARAM)))
engine.Case(cond2, func(data any, g req.GlobalParams) error {
t.Log("cond2", data)