Fix multi-depth eager loading of relationships. If a relationship is … #10

Merged
tiger5226 merged 1 commit from eagerloading_depth into master 2020-09-02 21:59:53 +02:00

View file

@ -5,9 +5,9 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/pkg/errors"
"github.com/lbryio/sqlboiler/boil" "github.com/lbryio/sqlboiler/boil"
"github.com/lbryio/sqlboiler/strmangle" "github.com/lbryio/sqlboiler/strmangle"
"github.com/pkg/errors"
) )
type loadRelationshipState struct { type loadRelationshipState struct {
@ -259,10 +259,14 @@ func collectLoaded(key string, loadingFrom reflect.Value) (reflect.Value, bindKi
for { for {
switch bkind { switch bkind {
case kindStruct: case kindStruct:
if !loadedObject.IsNil() {
collection = reflect.Append(collection, loadedObject) collection = reflect.Append(collection, loadedObject)
}
case kindPtrSliceStruct: case kindPtrSliceStruct:
if !loadedObject.IsNil() {
collection = reflect.AppendSlice(collection, loadedObject) collection = reflect.AppendSlice(collection, loadedObject)
} }
}
i++ i++
if i >= lnFrom { if i >= lnFrom {