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

Support Variable Relation

Browse Source
This commit is contained in:
Jinzhu 2022-03-18 14:30:30 +08:00
parent 5431da8caf
commit e6f7da0e0d
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
schema/relationship.go
View File

@ -416,6 +416,10 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
} }
} else { } else {
var primaryFields []*Field var primaryFields []*Field
var primarySchemaName = primarySchema.Name
if primarySchemaName == "" {
primarySchemaName = relation.FieldSchema.Name
}
if len(relation.primaryKeys) > 0 { if len(relation.primaryKeys) > 0 {
for _, primaryKey := range relation.primaryKeys { for _, primaryKey := range relation.primaryKeys {
@ -428,7 +432,7 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
} }
for _, primaryField := range primaryFields { for _, primaryField := range primaryFields {
lookUpName := primarySchema.Name + primaryField.Name lookUpName := primarySchemaName + primaryField.Name
if gl == guessBelongs { if gl == guessBelongs {
lookUpName = field.Name + primaryField.Name lookUpName = field.Name + primaryField.Name
} }

20
schema/relationship_test.go
View File

@ -491,6 +491,26 @@ func TestEmbeddedRelation(t *testing.T) {
} }
} }
func TestVariableRelation(t *testing.T) {
var result struct {
User
}
checkStructRelation(t, &result, Relation{
Name: "Account", Type: schema.HasOne, Schema: "", FieldSchema: "Account",
References: []Reference{
{"ID", "", "UserID", "Account", "", true},
},
})
checkStructRelation(t, &result, Relation{
Name: "Company", Type: schema.BelongsTo, Schema: "", FieldSchema: "Company",
References: []Reference{
{"ID", "Company", "CompanyID", "", "", false},
},
})
}
func TestSameForeignKey(t *testing.T) { func TestSameForeignKey(t *testing.T) {
type UserAux struct { type UserAux struct {
gorm.Model gorm.Model