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

[feat] 命名更新

Browse Source
This commit is contained in:
what 2023-07-20 15:04:07 +08:00
parent 9e1a2c4e24
commit 9683179bf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
condition_expr.go
View File

@ -198,7 +198,7 @@ func (this ConditionExpr) IsIgnoreEmptyParma(m contracts.ModelParam) bool {
return false return false
} }
func NewExpr(rResource, rField, token string, operator contracts.ConditionOperator, tType contracts.ConditionTokenType, ignoreEmptyParma bool, fn, fnParam string) contracts.ConditionExpr { func NewConditionExpr(rResource, rField, token string, operator contracts.ConditionOperator, tType contracts.ConditionTokenType, ignoreEmptyParma bool, fn, fnParam string) contracts.ConditionExpr {
return &ConditionExpr{ return &ConditionExpr{
operator: operator, operator: operator,
field: rField, field: rField,

8
engine/engine_test.go
View File

@ -26,7 +26,7 @@ func TestEngine(t *testing.T) {
cond1 := condition.New(contracts.ConditionType_AND, "条件1") cond1 := condition.New(contracts.ConditionType_AND, "条件1")
cond1.SetExpr(condition.NewExpr( cond1.SetExpr(condition.NewConditionExpr(
"TestTable", "age", "age", "TestTable", "age", "age",
contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM, contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM,
false, "", "", false, "", "",
@ -65,7 +65,7 @@ func TestRelationEngine(t *testing.T) {
} }
cond1 := condition.New(contracts.ConditionType_AND, "条件1"). cond1 := condition.New(contracts.ConditionType_AND, "条件1").
SetExpr(condition.NewExpr( SetExpr(condition.NewConditionExpr(
"TestTable", "age", "age", "TestTable", "age", "age",
contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM, contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM,
false, "", "", false, "", "",
@ -77,12 +77,12 @@ func TestRelationEngine(t *testing.T) {
}) })
cond2 := condition.New(contracts.ConditionType_OR, "条件2"). cond2 := condition.New(contracts.ConditionType_OR, "条件2").
SetExpr(condition.NewExpr( SetExpr(condition.NewConditionExpr(
"TestTableA", "age", "age", "TestTableA", "age", "age",
contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM, contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM,
false, "", "", false, "", "",
)). )).
SetExpr(condition.NewExpr( SetExpr(condition.NewConditionExpr(
"TestTable", "age", "age", "TestTable", "age", "age",
contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM, contracts.ConditionOperator_EQ, contracts.ConditionTokenType_PARAM,
false, "", "", false, "", "",