mongodb json tag

Author: zhufuyi

.github/RELEASE.md

@@ -1,5 +1,4 @@
 ## Change log
 
-- Add model, dao, handler, service, web service, and grpc service code generated from mongodb sql.
-- Add test generation code command script.
-- Update document.
+- Fix `⓶ create grpc service based on sql`, selecting multiple tables to generate code reports **unsupported db driver error**.
+- The mongodb json tag supports both shake case and camel case naming.

README.md

@@ -45,21 +45,15 @@ sponge is mainly based on `SQL` and `Protobuf` two ways to generate code, each w
 
 <br>
 
-#### Generate Code for Egg Model
+#### Generate Service Code for Egg Model
 
-The sponge code generation process strips away the business logic and non-business logic of the two major parts of the code. Sponge's code generation function as a hen, the generated service code is the egg, take the generated web service backend code as an example:
-
-- `Eggshell` is web service framework code (automatically generated without manual writing).
-- `Yolk` is the core of business logic. For example, defining mysql tables, defining api interfaces, and writing specific logic codes all belong to yolk (code that needs to be written manually).
-- `Albumen` is a bridge connecting the core code of business logic and the web framework code. For example, the registration route code, handler code, parameter verification code, error code, and swagger document generated according to the proto file belong to the albumen (code that automatically generated without manual writing).
-
-Here is egg model profiling diagram for `⓷Create web service based on protobuf`:
+The sponge code generation process strips away the business logic and non-business logic of the two major parts of the code. Sponge's code generation function as a hen, the generated service code is the egg, take the generated web service backend code as an example, egg model profiling diagram:
 
 <p align="center">
 <img width="1200px" src="https://raw.githubusercontent.com/zhufuyi/sponge_examples/main/assets/en_web-http-pb-anatomy.png">
 </p>
 
-In addition to the egg model of web service backend code, there are egg models of grpc service code and grpc gateway service code described in [sponge documentation](https://go-sponge.com/learn-about-sponge?id=%f0%9f%8f%b7project-code-egg-model).
+In addition to the egg model of web service backend code, there are egg models of grpc service code and grpc gateway service code, [click here to view](https://go-sponge.com/learn-about-sponge?id=%f0%9f%8f%b7egg-model-for-generate-service-code).
 
 <br>
 

assets/readme-cn.md

@@ -29,21 +29,15 @@ sponge主要基于`SQL`和`Protobuf`两种方式生成代码，每种方式拥
 
 <br>
 
-#### 生成代码的鸡蛋模型
+#### 生成服务代码的鸡蛋模型
 
-sponge生成代码过程中剥离了业务逻辑与非业务逻辑两大部分代码，把sponge的生成代码功能看作是母鸡，生成的服务代码就是鸡蛋，以生成的一个web服务后端代码为例：
-
-- `蛋壳`是web服务框架代码(自动生成，不需要人工编写)。
-- `蛋黄`是业务逻辑的核心，例如定义mysql表、在proto定义api接口、编写具体逻辑代码都属于蛋黄部分(需要人工编写的代码)。
-- `蛋白`是业务逻辑核心代码与web框架代码连接的桥梁，例如根据proto文件生成的注册路由代码、handler代码、dao代码、参数校验代码、错误码、swagger文档等都属于蛋白部分(自动生成，不需要人工编写)。
-
-下面是`⓷基于protobuf创建的web服务`代码的鸡蛋模型剖析图：
+sponge生成代码过程中剥离了业务逻辑与非业务逻辑两大部分代码，把sponge的生成代码功能看作是母鸡，生成的服务代码就是鸡蛋，以生成的一个web服务后端代码为例，鸡蛋模型剖析图：
 
 <p align="center">
 <img width="1200px" src="https://raw.githubusercontent.com/zhufuyi/sponge_examples/main/assets/web-http-pb-anatomy.png">
 </p>
 
-除了web服务后端代码鸡蛋模型，还有grpc服务代码、grpc网关服务代码的鸡蛋模型，在[sponge文档](https://go-sponge.com/zh-cn/learn-about-sponge?id=%f0%9f%8f%b7%e9%a1%b9%e7%9b%ae%e4%bb%a3%e7%a0%81%e9%b8%a1%e8%9b%8b%e6%a8%a1%e5%9e%8b)中有介绍。
+除了web服务后端代码鸡蛋模型，还有grpc服务代码和grpc网关服务代码的鸡蛋模型，点击[这里查看](https://go-sponge.com/zh-cn/learn-about-sponge?id=%f0%9f%8f%b7%e7%94%9f%e6%88%90%e6%9c%8d%e5%8a%a1%e4%bb%a3%e7%a0%81%e7%9a%84%e9%b8%a1%e8%9b%8b%e6%a8%a1%e5%9e%8b)。
 
 <br>
 

cmd/sponge/commands/patch/gen-db-init.go

@@ -97,7 +97,6 @@ type dbInitGenerator struct {
 }
 
 func (g *dbInitGenerator) generateCode() (string, error) {
-	fmt.Println(*g)
 	subTplName := "init-" + g.dbDriver
 	r := generate.Replacers[generate.TplNameSponge]
 	if r == nil {

cmd/sponge/server/handler.go

@@ -146,7 +146,6 @@ func handleGenerateCode(c *gin.Context, outPath string, arg string) {
 	}
 
 	out = os.TempDir() + gofile.GetPathDelimiter() + out
-	//fmt.Println("outTmp =", out)
 	args = append(args, fmt.Sprintf("--out=%s", out))
 
 	ctx, _ := context.WithTimeout(context.Background(), time.Second*10) // nolint

internal/config/serverNameExample_cc.go

@@ -25,4 +25,4 @@ type Nacos struct {
 	NamespaceID string `yaml:"namespaceID" json:"namespaceID"`
 	Port        int    `yaml:"port" json:"port"`
 	Scheme      string `yaml:"scheme" json:"scheme"`
-}
+}

pkg/ggorm/test_sqlite.db

@@ -6,25 +6,33 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
 	mgoOptions "go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func TestInit(t *testing.T) {
 	dsns := []string{
 		"mongodb://root:123456@192.168.3.37:27017/account",
 		"mongodb://root:123456@192.168.3.37:27017/account?connectTimeoutMS=2000",
+		// error
+		"mongodb-dsn",
+		"mongodb://root:123456@192.168.3.37",
 	}
 	for _, dsn := range dsns {
 		timeout := time.Second * 2
 		opts := &mgoOptions.ClientOptions{Timeout: &timeout}
 		db, err := Init(dsn, opts)
 		if err != nil {
 			t.Log(err)
-			return
+			continue
 		}
 		time.Sleep(time.Millisecond * 100)
 		defer Close(db)
 	}
+
+	defer func() { recover() }()
+	db := &mongo.Database{}
+	_ = Close(db)
 }
 
 func TestInit2(t *testing.T) {

pkg/mgo/mongo_test.go

@@ -64,16 +64,16 @@ var mgoTypeToGo = map[bsontype.Type]string{
 	bson.TypeJavaScript:       goTypeString,
 }
 
-var jsonTagFormat int32 // 0: camel case, 1: snake case
+var jsonTagFormat int32 = 1 // 0: snake case, 1: camel case
 
 // SetJSONTagSnakeCase set json tag format to snake case
 func SetJSONTagSnakeCase() {
-	atomic.AddInt32(&jsonTagFormat, 1)
+	atomic.AddInt32(&jsonTagFormat, -jsonTagFormat)
 }
 
 // SetJSONTagCamelCase set json tag format to camel case
 func SetJSONTagCamelCase() {
-	atomic.AddInt32(&jsonTagFormat, -jsonTagFormat)
+	atomic.AddInt32(&jsonTagFormat, 1)
 }
 
 // MgoField mongo field
@@ -172,9 +172,9 @@ func parseObject(name string, elements []bson.RawElement) (goTypeStr string, goO
 
 		var jsonTag string
 		if jsonTagFormat == 0 {
-			jsonTag = toLowerFirst(xstrings.ToCamelCase(k))
-		} else {
 			jsonTag = xstrings.ToSnakeCase(k)
+		} else {
+			jsonTag = toLowerFirst(xstrings.ToCamelCase(k))
 		}
 
 		goObjStr += fmt.Sprintf("    %s %s `bson:\"%s\" json:\"%s\"`\n", xstrings.ToCamelCase(k), t, k, jsonTag)

pkg/sql2code/parser/mongodb.go

@@ -320,6 +320,14 @@ func makeCode(stmt *ast.CreateTableStmt, opt options) (*codeText, error) {
 	if opt.ForceTableName || data.RawTableName != inflection.Plural(data.RawTableName) {
 		data.NameFunc = true
 	}
+	switch opt.DBDriver {
+	case DBDriverMongodb:
+		if opt.JSONNamedType != 0 {
+			SetJSONTagCamelCase()
+		} else {
+			SetJSONTagSnakeCase()
+		}
+	}
 
 	data.TableName = toCamel(data.TableName)
 	data.TName = firstLetterToLow(data.TableName)

pkg/sql2code/parser/parser.go

@@ -345,6 +345,7 @@ func Test_getMongodbTableFields(t *testing.T) {
 		},
 	}
 
+	SetJSONTagCamelCase()
 	goStructs := MgoFieldToGoStruct("foobar", fields)
 	t.Log(goStructs)
 
@@ -363,6 +364,7 @@ func Test_getMongodbTableFields(t *testing.T) {
 	_ = codes
 	//printCode(codes)
 
+	SetJSONTagSnakeCase()
 	sql, fieldsMap = ConvertToSQLByMgoFields("foobar", fields)
 	t.Log(sql)
 	opts = []Option{