diff --git a/condition_expr.go b/condition_expr.go index 950b656..c106d2b 100644 --- a/condition_expr.go +++ b/condition_expr.go @@ -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, diff --git a/engine/engine_test.go b/engine/engine_test.go index 2896640..a24462c 100644 --- a/engine/engine_test.go +++ b/engine/engine_test.go @@ -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)