[fix] 修复 contracts/helper 与 contracts/base 之间的循环引用

This commit is contained in:
what 2023-04-22 01:50:10 +08:00
parent d8fc2e9de9
commit 4c8ae371c3

View File

@ -2,7 +2,6 @@ package helper
import ( import (
"git.fsdpf.net/go/contracts" "git.fsdpf.net/go/contracts"
"git.fsdpf.net/go/contracts/base"
"git.fsdpf.net/go/db" "git.fsdpf.net/go/db"
) )
@ -22,12 +21,8 @@ type NewOrmConditionExpr func(rResource, rField, token string, operator contract
type NewOrmConditionFuncExpr func(rResource, rField, token string, operator contracts.ConditionOperator, tType contracts.ConditionTokenType, ignoreEmptyParma bool, fn, fnParam string) contracts.ConditionExpr type NewOrmConditionFuncExpr func(rResource, rField, token string, operator contracts.ConditionOperator, tType contracts.ConditionTokenType, ignoreEmptyParma bool, fn, fnParam string) contracts.ConditionExpr
type NewOrmConditionByRes func(items []base.ResCondition, describe string) contracts.Condition
type NewOrmQueryWithRecursive func(pField, cField string, root any, isWithoutCondition bool, depth int) contracts.QueryWithRecursive type NewOrmQueryWithRecursive func(pField, cField string, root any, isWithoutCondition bool, depth int) contracts.QueryWithRecursive
type NewOrmQueryField func(rField base.ResField, t contracts.QueryDataType, alias string, options int) contracts.QueryField
type NewOrmOrderBy func(sql string, direction contracts.OrderByDirection) contracts.OrderBy type NewOrmOrderBy func(sql string, direction contracts.OrderByDirection) contracts.OrderBy
type NewOrmGroupBy func(sql string) contracts.GroupBy type NewOrmGroupBy func(sql string) contracts.GroupBy