diff --git a/interface.go b/interface.go index 5d08fb9..1b8909a 100644 --- a/interface.go +++ b/interface.go @@ -57,7 +57,7 @@ type ISession interface { LoadDepth(respObj interface{}, id string, depth int) error //load with depth and filter - LoadDepthFilter(respObj interface{}, id string, depth int, filter *dsl.ConditionBuilder, params map[string]interface{}) error + LoadDepthFilter(respObj interface{}, id string, depth int, filter dsl.ConditionOperator, params map[string]interface{}) error //load with depth, filter and pagination LoadDepthFilterPagination(respObj interface{}, id string, depth int, filter dsl.ConditionOperator, params map[string]interface{}, pagination *Pagination) error diff --git a/interfacev2.go b/interfacev2.go index 72a26b8..8f46dfe 100644 --- a/interfacev2.go +++ b/interfacev2.go @@ -62,7 +62,7 @@ type ogmFunctions interface { LoadDepth(ctx context.Context, respObj, id interface{}, depth int) error //load with depth and filter - LoadDepthFilter(ctx context.Context, respObj, id interface{}, depth int, filter *dsl.ConditionBuilder, params map[string]interface{}) error + LoadDepthFilter(ctx context.Context, respObj, id interface{}, depth int, filter dsl.ConditionOperator, params map[string]interface{}) error //load with depth, filter and pagination LoadDepthFilterPagination(ctx context.Context, respObj, id interface{}, depth int, filter dsl.ConditionOperator, params map[string]interface{}, pagination *Pagination) error diff --git a/mocks/ISession.go b/mocks/ISession.go index e24ef46..55c8849 100644 --- a/mocks/ISession.go +++ b/mocks/ISession.go @@ -183,11 +183,11 @@ func (_m *ISession) LoadDepth(respObj interface{}, id string, depth int) error { } // LoadDepthFilter provides a mock function with given fields: respObj, id, depth, filter, params -func (_m *ISession) LoadDepthFilter(respObj interface{}, id string, depth int, filter *go_cypherdsl.ConditionBuilder, params map[string]interface{}) error { +func (_m *ISession) LoadDepthFilter(respObj interface{}, id string, depth int, filter *go_cypherdsl.ConditionOperator, params map[string]interface{}) error { ret := _m.Called(respObj, id, depth, filter, params) var r0 error - if rf, ok := ret.Get(0).(func(interface{}, string, int, *go_cypherdsl.ConditionBuilder, map[string]interface{}) error); ok { + if rf, ok := ret.Get(0).(func(interface{}, string, int, *go_cypherdsl.ConditionOperator, map[string]interface{}) error); ok { r0 = rf(respObj, id, depth, filter, params) } else { r0 = ret.Error(0) diff --git a/mocks/SessionV2.go b/mocks/SessionV2.go index 792e754..cc878a3 100644 --- a/mocks/SessionV2.go +++ b/mocks/SessionV2.go @@ -173,11 +173,11 @@ func (_m *SessionV2) LoadDepth(ctx context.Context, respObj interface{}, id inte } // LoadDepthFilter provides a mock function with given fields: ctx, respObj, id, depth, filter, params -func (_m *SessionV2) LoadDepthFilter(ctx context.Context, respObj interface{}, id interface{}, depth int, filter *go_cypherdsl.ConditionBuilder, params map[string]interface{}) error { +func (_m *SessionV2) LoadDepthFilter(ctx context.Context, respObj interface{}, id interface{}, depth int, filter *go_cypherdsl.ConditionOperator, params map[string]interface{}) error { ret := _m.Called(ctx, respObj, id, depth, filter, params) var r0 error - if rf, ok := ret.Get(0).(func(context.Context, interface{}, interface{}, int, *go_cypherdsl.ConditionBuilder, map[string]interface{}) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, interface{}, interface{}, int, *go_cypherdsl.ConditionOperator, map[string]interface{}) error); ok { r0 = rf(ctx, respObj, id, depth, filter, params) } else { r0 = ret.Error(0) diff --git a/mocks/TransactionV2.go b/mocks/TransactionV2.go index 68c1381..d7c618c 100644 --- a/mocks/TransactionV2.go +++ b/mocks/TransactionV2.go @@ -145,11 +145,11 @@ func (_m *TransactionV2) LoadDepth(ctx context.Context, respObj interface{}, id } // LoadDepthFilter provides a mock function with given fields: ctx, respObj, id, depth, filter, params -func (_m *TransactionV2) LoadDepthFilter(ctx context.Context, respObj interface{}, id interface{}, depth int, filter *go_cypherdsl.ConditionBuilder, params map[string]interface{}) error { +func (_m *TransactionV2) LoadDepthFilter(ctx context.Context, respObj interface{}, id interface{}, depth int, filter *go_cypherdsl.ConditionOperator, params map[string]interface{}) error { ret := _m.Called(ctx, respObj, id, depth, filter, params) var r0 error - if rf, ok := ret.Get(0).(func(context.Context, interface{}, interface{}, int, *go_cypherdsl.ConditionBuilder, map[string]interface{}) error); ok { + if rf, ok := ret.Get(0).(func(context.Context, interface{}, interface{}, int, *go_cypherdsl.ConditionOperator, map[string]interface{}) error); ok { r0 = rf(ctx, respObj, id, depth, filter, params) } else { r0 = ret.Error(0) diff --git a/session.go b/session.go index cf2fd3d..5209739 100644 --- a/session.go +++ b/session.go @@ -189,7 +189,7 @@ func (s *Session) LoadDepth(respObj interface{}, id string, depth int) error { return s.LoadDepthFilterPagination(respObj, id, depth, nil, nil, nil) } -func (s *Session) LoadDepthFilter(respObj interface{}, id string, depth int, filter *dsl.ConditionBuilder, params map[string]interface{}) error { +func (s *Session) LoadDepthFilter(respObj interface{}, id string, depth int, filter dsl.ConditionOperator, params map[string]interface{}) error { return s.LoadDepthFilterPagination(respObj, id, depth, filter, params, nil) } diff --git a/sessionv2.go b/sessionv2.go index 76742f5..f2c5a78 100644 --- a/sessionv2.go +++ b/sessionv2.go @@ -198,7 +198,7 @@ func (s *SessionV2Impl) LoadDepth(ctx context.Context, respObj, id interface{}, return s.LoadDepthFilterPagination(ctx, respObj, id, depth, nil, nil, nil) } -func (s *SessionV2Impl) LoadDepthFilter(ctx context.Context, respObj, id interface{}, depth int, filter *dsl.ConditionBuilder, params map[string]interface{}) error { +func (s *SessionV2Impl) LoadDepthFilter(ctx context.Context, respObj, id interface{}, depth int, filter dsl.ConditionOperator, params map[string]interface{}) error { var span opentracing.Span if ctx != nil && s.gogm.config.OpentracingEnabled { span, ctx = opentracing.StartSpanFromContext(ctx, "gogm.SessionV2Impl.LoadDepthFilter")