Fix overwrite preloading associations, close #4134

jinzhu · jinzhu · commit 42999e980916 · 2021-03-04T18:28:32.000+08:00
diff --git a/callbacks/query.go b/callbacks/query.go
@@ -172,7 +172,9 @@ func Preload(db *gorm.DB) {
 			if name == clause.Associations {
 				for _, rel := range db.Statement.Schema.Relationships.Relations {
 					if rel.Schema == db.Statement.Schema {
-						preloadMap[rel.Name] = map[string][]interface{}{}
+						if _, ok := preloadMap[rel.Name]; !ok {
+							preloadMap[rel.Name] = map[string][]interface{}{}
+						}
 					}
 				}
 			} else {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,9 @@ func Preload(db *gorm.DB) {`
`172`	`172`	`if name == clause.Associations {`
`173`	`173`	`for _, rel := range db.Statement.Schema.Relationships.Relations {`
`174`	`174`	`if rel.Schema == db.Statement.Schema {`
`175`		`- preloadMap[rel.Name] = map[string][]interface{}{}`
	`175`	`+ if _, ok := preloadMap[rel.Name]; !ok {`
	`176`	`+ preloadMap[rel.Name] = map[string][]interface{}{}`
	`177`	`+ }`
`176`	`178`	`}`
`177`	`179`	`}`
`178`	`180`	`} else {`