Skip to content
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
4 changes: 3 additions & 1 deletion database/gorm/query.go
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,15 @@ func (r *Query) Load(model any, relation string, args ...any) error {
copyDest := copyStruct(model)
err := r.With(relation, args...).Find(model)

relationRoot := strings.SplitN(relation, ".", 2)[0]

t := destType.Elem()
v := reflect.ValueOf(model).Elem()
for i := 0; i < t.NumField(); i++ {
if !t.Field(i).IsExported() {
continue
}
if t.Field(i).Name != relation {
if t.Field(i).Name != relationRoot {
v.Field(i).Set(copyDest.Field(i))
}
}
Expand Down
30 changes: 29 additions & 1 deletion tests/query_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3263,15 +3263,22 @@ func (s *QueryTestSuite) TestLimit() {

func (s *QueryTestSuite) TestLoad() {
for _, query := range s.queries {
user := User{Name: "load_user", Address: &Address{}, Books: []*Book{{}, {}}}
user := User{Name: "load_user", Address: &Address{}, Books: []*Book{{}, {}}, Roles: []*Role{{}, {}}}
user.Address.Name = "load_address"
user.Books[0].Name = "load_book0"
user.Books[0].Author = &Author{Name: "load_book0_author"}
user.Books[1].Name = "load_book1"
user.Roles[0].Name = "load_role0"
user.Roles[1].Name = "load_role1"

s.Nil(query.Query().Select(gorm.Associations).Create(&user))
s.True(user.ID > 0)
s.True(user.Address.ID > 0)
s.True(user.Books[0].ID > 0)
s.True(user.Books[1].ID > 0)
s.True(user.Books[0].Author.ID > 0)
s.True(user.Roles[0].ID > 0)
s.True(user.Roles[1].ID > 0)

tests := []struct {
description string
Expand Down Expand Up @@ -3325,6 +3332,27 @@ func (s *QueryTestSuite) TestLoad() {
s.Equal("load_book0", user.Books[0].Name)
},
},
{
description: "load nested relationship",
setup: func(description string) {
var user1 User
s.Nil(query.Query().Find(&user1, user.ID))
s.True(user1.ID > 0)
s.Equal("load_user", user1.Name)
s.Nil(query.Query().Load(&user1, "Books.Author"))
s.True(user1.Books[0].ID > 0)
s.Equal("load_book0", user1.Books[0].Name)
s.True(user1.Books[0].Author.ID > 0)
s.Equal("load_book0_author", user1.Books[0].Author.Name)
s.True(user1.Books[1].ID > 0)
s.Equal("load_book1", user1.Books[1].Name)
s.Nil(user1.Books[1].Author)
s.Nil(query.Query().Load(&user1, "Roles.Users"))
s.Equal("load_role0", user1.Roles[0].Name)
s.Equal("load_user", user1.Roles[0].Users[0].Name)
s.Equal("load_role1", user1.Roles[1].Name)
},
},
{
description: "error when relation is empty",
setup: func(description string) {
Expand Down