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

Fix invalid preload SQL when no data found, close #4443

Browse Source
This commit is contained in:
Jinzhu 2021-07-13 20:23:05 +08:00
parent c73fe96cfd
commit b13732c450
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
callbacks/preload.go
View File

@ -104,15 +104,17 @@ func preload(db *gorm.DB, rel *schema.Relationship, conds []interface{}, preload
reflectResults := rel.FieldSchema.MakeSlice().Elem() reflectResults := rel.FieldSchema.MakeSlice().Elem()
column, values := schema.ToQueryValues(clause.CurrentTable, relForeignKeys, foreignValues) column, values := schema.ToQueryValues(clause.CurrentTable, relForeignKeys, foreignValues)
for _, cond := range conds { if len(values) != 0 {
if fc, ok := cond.(func(*gorm.DB) *gorm.DB); ok { for _, cond := range conds {
tx = fc(tx) if fc, ok := cond.(func(*gorm.DB) *gorm.DB); ok {
} else { tx = fc(tx)
inlineConds = append(inlineConds, cond) } else {
inlineConds = append(inlineConds, cond)
}
} }
}
db.AddError(tx.Where(clause.IN{Column: column, Values: values}).Find(reflectResults.Addr().Interface(), inlineConds...).Error) db.AddError(tx.Where(clause.IN{Column: column, Values: values}).Find(reflectResults.Addr().Interface(), inlineConds...).Error)
}
fieldValues := make([]interface{}, len(relForeignFields)) fieldValues := make([]interface{}, len(relForeignFields))