tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: nested joins alias (#6265)

Browse Source
This commit is contained in:
Cr 2023-04-26 22:19:32 +08:00 committed by GitHub
parent 1f763c81cb
commit 407bedae0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
callbacks/query.go
View File

@ -234,8 +234,13 @@ func BuildQuerySQL(db *gorm.DB) {
fromClause.Joins = append(fromClause.Joins, genJoinClause(join.JoinType, parentTableName, rel)) fromClause.Joins = append(fromClause.Joins, genJoinClause(join.JoinType, parentTableName, rel))
specifiedRelationsName[nestedAlias] = nil specifiedRelationsName[nestedAlias] = nil
} }
if parentTableName != clause.CurrentTable {
parentTableName = utils.NestedRelationName(parentTableName, rel.Name)
} else {
parentTableName = rel.Name parentTableName = rel.Name
} }
}
} else { } else {
fromClause.Joins = append(fromClause.Joins, clause.Join{ fromClause.Joins = append(fromClause.Joins, clause.Join{
Expression: clause.NamedExpr{SQL: join.Name, Vars: join.Conds}, Expression: clause.NamedExpr{SQL: join.Name, Vars: join.Conds},

14
tests/joins_test.go
View File

@ -330,7 +330,18 @@ func TestNestedJoins(t *testing.T) {
users := []User{ users := []User{
{ {
Name: "nested-joins-1", Name: "nested-joins-1",
Manager: GetUser("nested-joins-manager-1", Config{Company: true, NamedPet: true}), Manager: &User{
Name: "nested-joins-manager-1",
Company: Company{
Name: "nested-joins-manager-company-1",
},
NamedPet: &Pet{
Name: "nested-joins-manager-namepet-1",
Toy: Toy{
Name: "nested-joins-manager-namepet-toy-1",
},
},
},
NamedPet: &Pet{Name: "nested-joins-namepet-1", Toy: Toy{Name: "nested-joins-namepet-toy-1"}}, NamedPet: &Pet{Name: "nested-joins-namepet-1", Toy: Toy{Name: "nested-joins-namepet-toy-1"}},
}, },
{ {
@ -352,6 +363,7 @@ func TestNestedJoins(t *testing.T) {
Joins("Manager"). Joins("Manager").
Joins("Manager.Company"). Joins("Manager.Company").
Joins("Manager.NamedPet"). Joins("Manager.NamedPet").
Joins("Manager.NamedPet.Toy").
Joins("NamedPet"). Joins("NamedPet").
Joins("NamedPet.Toy"). Joins("NamedPet.Toy").
Find(&users2, "users.id IN ?", userIDs).Error; err != nil { Find(&users2, "users.id IN ?", userIDs).Error; err != nil {