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

let gorm can scan protobuf struct without add an ignore tag ("-") manually

Browse Source 
link: https://github.com/go-gorm/gorm/issues/4877
This commit is contained in:
Frankee.zhou 2021-11-27 15:17:39 +08:00
parent b8f33a42a4
commit 5d15e1a500
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
schema/schema.go
View File

@ -155,7 +155,7 @@ func ParseWithSpecialTableName(dest interface{}, cacheStore *sync.Map, namer Nam
} }
for i := 0; i < modelType.NumField(); i++ { for i := 0; i < modelType.NumField(); i++ {
if fieldStruct := modelType.Field(i); ast.IsExported(fieldStruct.Name) { if fieldStruct := modelType.Field(i); ast.IsExported(fieldStruct.Name) && fieldStruct.Tag.Get("json") != "-" {
if field := schema.ParseField(fieldStruct); field.EmbeddedSchema != nil { if field := schema.ParseField(fieldStruct); field.EmbeddedSchema != nil {
schema.Fields = append(schema.Fields, field.EmbeddedSchema.Fields...) schema.Fields = append(schema.Fields, field.EmbeddedSchema.Fields...)
} else { } else {

18
schema/schema_test.go
View File

@ -297,3 +297,21 @@ func TestEmbeddedStructForCustomizedNamingStrategy(t *testing.T) {
}) })
} }
} }
func TestParseProtobufStruct(t *testing.T) {
type Response struct {
Code *uint32 `protobuf:"varint,1,opt,name=code" json:"code,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
}
responseSchema, err := schema.Parse(&Response{}, &sync.Map{}, CustomizedNamingStrategy{schema.NamingStrategy{}})
if err != nil {
t.Fatalf("failed to parse protobuf struct, got error %v", err)
}
if len(responseSchema.Fields) != 1 || responseSchema.Fields[0].Name != "Code" {
t.Errorf("schema %v do include private field in protobuf struct", responseSchema)
}
}