From eeb1a8d59816d5d765f986d193edc02f46045ff9 Mon Sep 17 00:00:00 2001 From: Nikita Tokarchuk Date: Wed, 18 Nov 2020 21:01:56 +0100 Subject: [PATCH] Change preloader query function interface --- mongox/database/database.go | 2 +- mongox/database/loadarray.go | 2 +- mongox/database/loadone.go | 2 +- mongox/database/loadstream.go | 2 +- mongox/query/query.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mongox/database/database.go b/mongox/database/database.go index d6563c9..e7265fc 100644 --- a/mongox/database/database.go +++ b/mongox/database/database.go @@ -129,7 +129,7 @@ func (d *Database) createAggregateLoad(target interface{}, composed *query.Query el := reflect.ValueOf(target).Elem() elType := el.Type() numField := elType.NumField() - _, preloads := composed.Preloader() + preloads, _ := composed.Preloader() for i := 0; i < numField; i++ { diff --git a/mongox/database/loadarray.go b/mongox/database/loadarray.go index d22f46a..d3d8671 100644 --- a/mongox/database/loadarray.go +++ b/mongox/database/loadarray.go @@ -37,7 +37,7 @@ func (d *Database) LoadArray(target interface{}, filters ...interface{}) (err er } zeroElem := reflect.Zero(targetSliceElemT) - hasPreloader, _ := composed.Preloader() + _, hasPreloader := composed.Preloader() ctx := query.WithContext(d.Context(), composed) var result *mongox.Cursor diff --git a/mongox/database/loadone.go b/mongox/database/loadone.go index 95bb18a..e9db17d 100644 --- a/mongox/database/loadone.go +++ b/mongox/database/loadone.go @@ -16,7 +16,7 @@ func (d *Database) LoadOne(target interface{}, filters ...interface{}) (err erro return } - hasPreloader, _ := composed.Preloader() + _, hasPreloader := composed.Preloader() ctx := query.WithContext(d.Context(), composed) var result *mongox.Cursor diff --git a/mongox/database/loadstream.go b/mongox/database/loadstream.go index d9644f4..89dd656 100644 --- a/mongox/database/loadstream.go +++ b/mongox/database/loadstream.go @@ -15,7 +15,7 @@ func (d *Database) LoadStream(target interface{}, filters ...interface{}) (loade return } - hasPreloader, _ := composed.Preloader() + _, hasPreloader := composed.Preloader() ctx := query.WithContext(d.Context(), composed) var cursor *mongox.Cursor diff --git a/mongox/query/query.go b/mongox/query/query.go index 44ef496..2f44783 100644 --- a/mongox/query/query.go +++ b/mongox/query/query.go @@ -76,10 +76,10 @@ func (q *Query) Updater() (update primitive.A) { } // Preloader is a preloader list for a query -func (q *Query) Preloader() (ok bool, preloads []string) { +func (q *Query) Preloader() (preloads []string, ok bool) { if q.preloader == nil { - return false, nil + return nil, false } preloads = q.preloader.Preload()