[add]: support ignore unnamed filed(for table inherit)

chenxyzl · Jul 3, 2024 · 4c2cf2a · 4c2cf2a
1 parent 56f05af
commit 4c2cf2a
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 20 deletions.
diff --git a/example/bson/example_bson.model.bson.go b/example/bson/example_bson.model.bson.go
diff --git a/example/bson/example_bson.model.gen.go b/example/bson/example_bson.model.gen.go
diff --git a/example/common/common.model.bson.go b/example/common/common.model.bson.go
diff --git a/example/common/common.model.gen.go b/example/common/common.model.gen.go
diff --git a/example/nest/example_nest.model.bson.go b/example/nest/example_nest.model.bson.go
diff --git a/example/nest/example_nest.model.gen.go b/example/nest/example_nest.model.gen.go
diff --git a/example/setter/example_setter.model.gen.go b/example/setter/example_setter.model.gen.go
diff --git a/example/with_ignore/with_ignore.model.bson.go b/example/with_ignore/with_ignore.model.bson.go
diff --git a/example/with_ignore/with_ignore.model.gen.go b/example/with_ignore/with_ignore.model.gen.go
diff --git a/gsgen_tools/internal/gen_helper.go b/gsgen_tools/internal/gen_helper.go
@@ -13,6 +13,7 @@ import (
 	"time"
 )
 
+const ignoreNameTag = "`in:\"-\"`" //means ignore name, means inherit
 const bsonIgnoreTag = "`bson:\"-\"`"
 const maxFieldCount = 63
 
@@ -223,7 +224,10 @@ func checkStructFieldBase(structName string, structType *ast.StructType, needDir
 	for _, field := range structType.Fields.List {
 		if len(field.Names) > 1 { //每行只能定义1个
 			panic(fmt.Sprintf("类型:%v,每行只能声明1个filed", structName))
-		} else if len(field.Names) == 0 { //匿名类型必须只能是gsmodel.DirtyModel
+		} else if len(field.Names) == 0 { //匿名类型必须配置ignoreNameTag或gsmodel.DirtyModel类型
+			if field.Tag.Value == ignoreNameTag {
+				continue
+			}
 			if !needDirty {
 				panic(fmt.Sprintf("类型:%v, 非dirty模式下不能有匿名类(dirty模式下则匿名字段必须为gsmodel.DirtyModel类型)", structName))
 			}

diff --git a/gsgen_tools/internal/version.go b/gsgen_tools/internal/version.go
@@ -1,3 +1,3 @@
 package internal
 
-const Version = "1.1.8"
+const Version = "1.1.9"