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

detect embedded by namer

Browse Source
This commit is contained in:
wener 2021-01-19 15:01:02 +08:00
parent 4a3a93fdac
commit 6e256da84c
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
schema/field.go
View File

@ -7,7 +7,6 @@ import (
"reflect" "reflect"
"strconv" "strconv"
"strings" "strings"
"sync"
"time" "time"
"github.com/jinzhu/now" "github.com/jinzhu/now"
@ -334,9 +333,7 @@ func (schema *Schema) ParseField(fieldStruct reflect.StructField) *Field {
field.Updatable = false field.Updatable = false
field.Readable = false field.Readable = false
cacheStore := &sync.Map{} cacheStore := schema.cacheStore
cacheStore.Store(embeddedCacheKey, true)
cacheStore.Store(schema.ModelType, schema)
if field.EmbeddedSchema, err = getOrParse(fieldValue.Interface(), cacheStore, embeddedNamer{Table: schema.Table, Namer: schema.namer}); err != nil { if field.EmbeddedSchema, err = getOrParse(fieldValue.Interface(), cacheStore, embeddedNamer{Table: schema.Table, Namer: schema.namer}); err != nil {
schema.err = err schema.err = err
} }

2
schema/schema.go
View File

@ -230,7 +230,7 @@ func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error)
} }
defer close(schema.initialized) defer close(schema.initialized)
if _, embedded := schema.cacheStore.Load(embeddedCacheKey); !embedded { if _, ok := namer.(embeddedNamer); !ok {
for _, field := range schema.Fields { for _, field := range schema.Fields {
if field.DataType == "" && (field.Creatable || field.Updatable || field.Readable) { if field.DataType == "" && (field.Creatable || field.Updatable || field.Readable) {
if schema.parseRelation(field); schema.err != nil { if schema.parseRelation(field); schema.err != nil {