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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Steve Fan 2020-08-30 23:48:59 +08:00
commit 3d1bd9d4c4
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
schema/schema.go
View File

@ -161,13 +161,18 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
field.setupValuerAndSetter() field.setupValuerAndSetter()
} }
if f := schema.LookUpField("id"); f != nil { prioritizedPrimaryField := schema.LookUpField("id")
if f.PrimaryKey { if prioritizedPrimaryField == nil {
schema.PrioritizedPrimaryField = f prioritizedPrimaryField = schema.LookUpField("ID")
}
if prioritizedPrimaryField != nil {
if prioritizedPrimaryField.PrimaryKey {
schema.PrioritizedPrimaryField = prioritizedPrimaryField
} else if len(schema.PrimaryFields) == 0 { } else if len(schema.PrimaryFields) == 0 {
f.PrimaryKey = true prioritizedPrimaryField.PrimaryKey = true
schema.PrioritizedPrimaryField = f schema.PrioritizedPrimaryField = prioritizedPrimaryField
schema.PrimaryFields = append(schema.PrimaryFields, f) schema.PrimaryFields = append(schema.PrimaryFields, prioritizedPrimaryField)
} }
} }