Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use reflect.Append when preloading nested associations instead of making a slice with fixed size #7014

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions callbacks/preload.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,15 @@ func preloadEntryPoint(db *gorm.DB, joins []string, relationships *schema.Relati
case reflect.Slice, reflect.Array:
if rv.Len() > 0 {
reflectValue := rel.FieldSchema.MakeSlice().Elem()
reflectValue.SetLen(rv.Len())
for i := 0; i < rv.Len(); i++ {
frv := rel.Field.ReflectValueOf(db.Statement.Context, rv.Index(i))
if frv.Kind() != reflect.Ptr {
reflectValue.Index(i).Set(frv.Addr())
reflectValue = reflect.Append(reflectValue, frv.Addr())
emilienkofman marked this conversation as resolved.
Show resolved Hide resolved
} else {
reflectValue.Index(i).Set(frv)
if frv.IsNil() {
continue
emilienkofman marked this conversation as resolved.
Show resolved Hide resolved
}
reflectValue = reflect.Append(reflectValue, frv)
}
}

Expand Down
3 changes: 2 additions & 1 deletion schema/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ func (schema Schema) String() string {
}

func (schema Schema) MakeSlice() reflect.Value {
slice := reflect.MakeSlice(reflect.SliceOf(reflect.PtrTo(schema.ModelType)), 0, 20)
slice := reflect.MakeSlice(reflect.SliceOf(reflect.PointerTo(schema.ModelType)), 0, 20)
results := reflect.New(slice.Type())
results.Elem().Set(slice)

return results
}

Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
gorm.io/driver/postgres v1.5.7
gorm.io/driver/sqlite v1.5.5
gorm.io/driver/sqlserver v1.5.3
gorm.io/gorm v1.25.9
gorm.io/gorm v1.25.10
)

require (
Expand Down
74 changes: 74 additions & 0 deletions tests/joins_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package tests_test

import (
"fmt"
"regexp"
"sort"
"testing"

"github.com/stretchr/testify/assert"
"gorm.io/gorm"
. "gorm.io/gorm/utils/tests"
)
Expand Down Expand Up @@ -400,3 +402,75 @@ func TestNestedJoins(t *testing.T) {
CheckPet(t, *user.Manager.NamedPet, *users2[idx].Manager.NamedPet)
}
}

func TestJoinsPreload_Issue7013(t *testing.T) {
manager := &User{Name: "Manager"}
DB.Create(manager)

var userIDs []uint
for i := 0; i < 21; i++ {
user := &User{Name: fmt.Sprintf("User%d", i), ManagerID: &manager.ID}
DB.Create(user)
userIDs = append(userIDs, user.ID)
}

var entries []User
assert.NotPanics(t, func() {
assert.NoError(t,
DB.Debug().Preload("Manager.Team").
Joins("Manager.Company").
Find(&entries).Error)
a631807682 marked this conversation as resolved.
Show resolved Hide resolved
})
}

func TestJoinsPreload_Issue7013_RelationEmpty(t *testing.T) {
type (
Furniture struct {
gorm.Model
OwnerID *uint
}

Owner struct {
gorm.Model
Furnitures []Furniture
CompanyID *uint
Company Company
}

Building struct {
gorm.Model
Name string
OwnerID *uint
Owner Owner
}
)

DB.Migrator().DropTable(&Building{}, &Owner{}, &Furniture{})
DB.Migrator().AutoMigrate(&Building{}, &Owner{}, &Furniture{})

home := &Building{Name: "relation_empty"}
DB.Create(home)

var entries []Building
assert.NotPanics(t, func() {
assert.NoError(t,
DB.Debug().Preload("Owner.Furnitures").
Joins("Owner.Company").
Find(&entries).Error)
})

AssertEqual(t, entries, []Building{{Model: home.Model, Name: "relation_empty", Owner: Owner{Company: Company{}}}})
}

func TestJoinsPreload_Issue7013_NoEntries(t *testing.T) {
var entries []User
assert.NotPanics(t, func() {
assert.NoError(t,
DB.Debug().Preload("Manager.Team").
Joins("Manager.Company").
Where("false").
Find(&entries).Error)
})

AssertEqual(t, len(entries), 0)
emilienkofman marked this conversation as resolved.
Show resolved Hide resolved
}
Loading