Merge pull request #10 from lbryio/eagerloading_depth

Fix multi-depth eager loading of relationships. If a relationship is …
Fix multi-depth eager loading of relationships. If a relationship is nil, do not add it to the collection for checking the next depth level.
2020-09-02 15:59:52 -04:00 · 2020-08-19 23:43:39 -04:00 · 2020-03-05 16:29:03 -05:00
1 changed files with 7 additions and 3 deletions
--- a/queries/eager_load.go
+++ b/queries/eager_load.go
@ -5,9 +5,9 @@ import (
 	"reflect"
 	"strings"

-	"github.com/pkg/errors"
 	"github.com/lbryio/sqlboiler/boil"
 	"github.com/lbryio/sqlboiler/strmangle"
+	"github.com/pkg/errors"
 )

 type loadRelationshipState struct {
@ -259,9 +259,13 @@ func collectLoaded(key string, loadingFrom reflect.Value) (reflect.Value, bindKi
 	for {
 		switch bkind {
 		case kindStruct:
-			collection = reflect.Append(collection, loadedObject)
+			if !loadedObject.IsNil() {
+				collection = reflect.Append(collection, loadedObject)
+			}
 		case kindPtrSliceStruct:
-			collection = reflect.AppendSlice(collection, loadedObject)
+			if !loadedObject.IsNil() {
+				collection = reflect.AppendSlice(collection, loadedObject)
+			}
 		}

 		i++
Author	SHA1	Message	Date
Mark	6b4e052bed	Merge pull request #10 from lbryio/eagerloading_depth Fix multi-depth eager loading of relationships. If a relationship is …	2020-09-02 15:59:52 -04:00
Mark Beamer Jr	3db4f30f56	Fix multi-depth eager loading of relationships. If a relationship is nil, do not add it to the collection for checking the next depth level.	2020-08-19 23:43:39 -04:00
Niko Storni	256a6d4225	update lbry.go library	2020-03-05 16:29:03 -05:00