From 4a4f4300fed6ebfccc478f9bc6c7f259fb8c1032 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 28 Jun 2021 00:26:29 +0800 Subject: [PATCH] improve code --- tags/parser.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tags/parser.go b/tags/parser.go index 23d74aa9..481b7f8e 100644 --- a/tags/parser.go +++ b/tags/parser.go @@ -246,12 +246,12 @@ func (parser *Parser) parseField(table *schemas.Table, field reflect.StructField tag = field.Tag ormTagStr = strings.TrimSpace(tag.Get(parser.identifier)) ) - if ormTagStr == "" { - return parser.parseFieldWithNoTag(field, fieldValue) - } if ormTagStr == "-" { return nil, ErrIgnoreField } + if ormTagStr == "" { + return parser.parseFieldWithNoTag(field, fieldValue) + } tags, err := splitTag(ormTagStr) if err != nil { return nil, err @@ -259,6 +259,13 @@ func (parser *Parser) parseField(table *schemas.Table, field reflect.StructField return parser.parseFieldWithTags(table, field, fieldValue, tags) } +func isNotTitle(n string) bool { + for _, c := range n { + return unicode.IsLower(c) + } + return true +} + // Parse parses a struct as a table information func (parser *Parser) Parse(v reflect.Value) (*schemas.Table, error) { t := v.Type() @@ -275,14 +282,7 @@ func (parser *Parser) Parse(v reflect.Value) (*schemas.Table, error) { table.Name = names.GetTableName(parser.tableMapper, v) for i := 0; i < t.NumField(); i++ { - var isUnexportField bool - for _, c := range t.Field(i).Name { - if unicode.IsLower(c) { - isUnexportField = true - } - break - } - if isUnexportField { + if isNotTitle(t.Field(i).Name) { continue }