Updated session to not use dsl.ConditionBuilder. Fixes #65

z5labs · Jan 12, 2022 · c80b3ab · c80b3ab
1 parent 6799ff1
commit c80b3ab
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
diff --git a/mocks/SessionV2.go b/mocks/SessionV2.go
diff --git a/mocks/TransactionV2.go b/mocks/TransactionV2.go
diff --git 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
@@ -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")