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

Merge d44a47525fe8f338208ab19a142a0e507474b766 into 21fb3ae1febe4581f80a4d5633f3fffd6d10a606

Browse Source
This commit is contained in:
Zeal 2018-02-10 06:05:29 +00:00 committed by GitHub
commit 0689964551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
model_struct.go
View File

@ -276,7 +276,10 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
// source foreign keys (db names) // source foreign keys (db names)
relationship.ForeignFieldNames = append(relationship.ForeignFieldNames, foreignField.DBName) relationship.ForeignFieldNames = append(relationship.ForeignFieldNames, foreignField.DBName)
// join table foreign keys for source // join table foreign keys for source
joinTableDBName := ToDBName(reflectType.Name()) + "_" + foreignField.DBName joinTableDBName := ToDBName(field.TagSettings["FOREIGNCOLUMN"])
if len(joinTableDBName) == 0 {
joinTableDBName = ToDBName(reflectType.Name()) + "_" + foreignField.DBName
}
relationship.ForeignDBNames = append(relationship.ForeignDBNames, joinTableDBName) relationship.ForeignDBNames = append(relationship.ForeignDBNames, joinTableDBName)
} }
} }
@ -293,7 +296,10 @@ func (scope *Scope) GetModelStruct() *ModelStruct {
// association foreign keys (db names) // association foreign keys (db names)
relationship.AssociationForeignFieldNames = append(relationship.AssociationForeignFieldNames, field.DBName) relationship.AssociationForeignFieldNames = append(relationship.AssociationForeignFieldNames, field.DBName)
// join table foreign keys for association // join table foreign keys for association
joinTableDBName := ToDBName(elemType.Name()) + "_" + field.DBName joinTableDBName := ToDBName(field.TagSettings["ASSOCIATIONFOREIGNCOLUMN"])
if len(joinTableDBName) == 0 {
joinTableDBName = ToDBName(reflectType.Name()) + "_" + field.DBName
}
relationship.AssociationForeignDBNames = append(relationship.AssociationForeignDBNames, joinTableDBName) relationship.AssociationForeignDBNames = append(relationship.AssociationForeignDBNames, joinTableDBName)
} }
} }