style: adjustment code

zhufuyi · zhufuyi · commit 091ad8b52916 · 2024-11-25T14:41:53.000+08:00
diff --git a/Makefile b/Makefile
@@ -161,7 +161,7 @@ image-build-rpc-test:
 
 
 .PHONY: patch
-# Patch some dependent code. 1. Add database initialization code, e.g. make patch TYPE=mysql, also supports mongodb, postgresql, tidb, sqlite. 2. Add dependent types.proto file, e.g. make patch TYPE=types-pb
+# Patch some dependent code. 1. Add database initialization code, e.g. make patch TYPE=mysql, also supports mongodb, postgresql, sqlite. 2. Add dependent types.proto file, e.g. make patch TYPE=types-pb
 patch:
 	@bash scripts/patch.sh $(TYPE)
 
diff --git a/cmd/sponge/commands/generate/dao.go b/cmd/sponge/commands/generate/dao.go
@@ -119,7 +119,7 @@ using help:
 
 	cmd.Flags().StringVarP(&moduleName, "module-name", "m", "", "module-name is the name of the module in the go.mod file")
 	//_ = cmd.MarkFlagRequired("module-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/handler-pb.go b/cmd/sponge/commands/generate/handler-pb.go
@@ -119,7 +119,7 @@ using help:
 	//_ = cmd.MarkFlagRequired("module-name")
 	cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
 	//_ = cmd.MarkFlagRequired("server-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/handler.go b/cmd/sponge/commands/generate/handler.go
@@ -115,7 +115,7 @@ using help:
 	cmd.Flags().StringVarP(&moduleName, "module-name", "m", "", "module-name is the name of the module in the go.mod file")
 	//_ = cmd.MarkFlagRequired("module-name")
 	cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/http.go b/cmd/sponge/commands/generate/http.go
@@ -152,7 +152,7 @@ using help:
 	_ = cmd.MarkFlagRequired("server-name")
 	cmd.Flags().StringVarP(&projectName, "project-name", "p", "", "project name")
 	_ = cmd.MarkFlagRequired("project-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/model.go b/cmd/sponge/commands/generate/model.go
@@ -77,7 +77,7 @@ using help:
 		},
 	}
 
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/protobuf.go b/cmd/sponge/commands/generate/protobuf.go
@@ -104,7 +104,7 @@ using help:
 	//_ = cmd.MarkFlagRequired("module-name")
 	cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
 	//_ = cmd.MarkFlagRequired("server-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/rpc.go b/cmd/sponge/commands/generate/rpc.go
@@ -152,7 +152,7 @@ using help:
 	_ = cmd.MarkFlagRequired("server-name")
 	cmd.Flags().StringVarP(&projectName, "project-name", "p", "", "project name")
 	_ = cmd.MarkFlagRequired("project-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/service-handler.go b/cmd/sponge/commands/generate/service-handler.go
@@ -120,7 +120,7 @@ using help:
 	//_ = cmd.MarkFlagRequired("module-name")
 	cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
 	//_ = cmd.MarkFlagRequired("server-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/generate/service.go b/cmd/sponge/commands/generate/service.go
@@ -118,7 +118,7 @@ using help:
 	//_ = cmd.MarkFlagRequired("module-name")
 	cmd.Flags().StringVarP(&serverName, "server-name", "s", "", "server name")
 	//_ = cmd.MarkFlagRequired("server-name")
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
 	cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")
diff --git a/cmd/sponge/commands/patch.go b/cmd/sponge/commands/patch.go
@@ -19,7 +19,6 @@ func PatchCommand() *cobra.Command {
 	cmd.AddCommand(
 		patch.DeleteJSONOmitemptyCommand(),
 		patch.GenerateDBInitCommand(),
-		patch.GenMysqlInitCommand(),
 		patch.GenTypesPbCommand(),
 		patch.CopyProtoCommand(),
 		patch.CopyThirdPartyProtoCommand(),
diff --git a/cmd/sponge/commands/patch/gen-db-init.go b/cmd/sponge/commands/patch/gen-db-init.go
@@ -18,7 +18,7 @@ import (
 func GenerateDBInitCommand() *cobra.Command {
 	var (
 		moduleName string // go.mod module name
-		dbDriver   string // database driver e.g. mysql, mongodb, postgresql, tidb, sqlite
+		dbDriver   string // database driver e.g. mysql, mongodb, postgresql, sqlite
 		outPath    string // output directory
 		targetFile = "internal/database/init.go"
 	)
@@ -100,7 +100,7 @@ using help:
 		},
 	}
 
-	cmd.Flags().StringVarP(&dbDriver, "db-driver", "k", "", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&dbDriver, "db-driver", "k", "", "database driver, support mysql, mongodb, postgresql, sqlite")
 	cmd.Flags().StringVarP(&moduleName, "module-name", "m", "", "module-name is the name of the module in the 'go.mod' file")
 	cmd.Flags().StringVarP(&outPath, "out", "o", "", "output directory, default is ./mysql-init_<time>, "+
 		"if you specify the directory where the web or microservice generated by sponge, the module-name flag can be ignored")
diff --git a/cmd/sponge/commands/template/sql.go b/cmd/sponge/commands/template/sql.go
@@ -122,7 +122,7 @@ func SQLCommand() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")
+	cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "", "database driver, support mysql, mongodb, postgresql, sqlite")
 	_ = cmd.MarkFlagRequired("db-driver")
 	cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint
 	_ = cmd.MarkFlagRequired("db-dsn")
diff --git a/pkg/ggorm/README.md b/pkg/ggorm/README.md
@@ -2,7 +2,7 @@
 
 `ggorm` library wrapped in [gorm](gorm.io/gorm), with added features such as tracer, paging queries, etc.
 
-Support `mysql`, `postgresql`, `tidb`, `sqlite`.
+Support `mysql`, `postgresql`, `sqlite`.
 
 <br>
 
diff --git a/pkg/sql2code/sql2code.go b/pkg/sql2code/sql2code.go
@@ -20,7 +20,7 @@ type Args struct {
 
 	DDLFile string // DDL file
 
-	DBDriver   string            // db driver name, such as mysql, mongodb, postgresql, tidb, sqlite, default is mysql
+	DBDriver   string            // db driver name, such as mysql, mongodb, postgresql, sqlite, default is mysql
 	DBDsn      string            // connecting to mysql's dsn, if DBDriver is sqlite, DBDsn is local db file
 	DBTable    string            // table name
 	fieldTypes map[string]string // field name:type
diff --git a/pkg/sql2code/sql2code_test.go b/pkg/sql2code/sql2code_test.go
@@ -85,24 +85,6 @@ func TestGenerate(t *testing.T) {
 			}},
 			wantErr: false,
 		},
-		{
-			name: "sql from mysql",
-			args: args{args: &Args{
-				DBDsn:    "root:123456@(192.168.3.37:3306)/account",
-				DBTable:  "user",
-				DBDriver: "mysql",
-			}},
-			wantErr: false,
-		},
-		{
-			name: "sql from postgresql",
-			args: args{args: &Args{
-				DBDsn:    "root:123456@(192.168.3.37:5432)/account",
-				DBTable:  "user",
-				DBDriver: "postgresql",
-			}},
-			wantErr: false,
-		},
 		{
 			name: "sql from sqlite",
 			args: args{args: &Args{
@@ -112,16 +94,34 @@ func TestGenerate(t *testing.T) {
 			}},
 			wantErr: false,
 		},
-		{
-			name: "sql from mongodb",
-			args: args{args: &Args{
-				DBDsn:            "root:123456@(192.168.3.37:27017)/account",
-				DBTable:          "people",
-				DBDriver:         "mongodb",
-				IsCustomTemplate: true,
-			}},
-			wantErr: false,
-		},
+		//{
+		//	name: "sql from mysql",
+		//	args: args{args: &Args{
+		//		DBDsn:    "root:123456@(192.168.3.37:3306)/account",
+		//		DBTable:  "user",
+		//		DBDriver: "mysql",
+		//	}},
+		//	wantErr: false,
+		//},
+		//{
+		//	name: "sql from postgresql",
+		//	args: args{args: &Args{
+		//		DBDsn:    "root:123456@(192.168.3.37:5432)/account",
+		//		DBTable:  "user",
+		//		DBDriver: "postgresql",
+		//	}},
+		//	wantErr: false,
+		//},
+		//{
+		//	name: "sql from mongodb",
+		//	args: args{args: &Args{
+		//		DBDsn:            "root:123456@(192.168.3.37:27017)/account",
+		//		DBTable:          "people",
+		//		DBDriver:         "mongodb",
+		//		IsCustomTemplate: true,
+		//	}},
+		//	wantErr: false,
+		//},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
diff --git a/scripts/patch.sh b/scripts/patch.sh
@@ -4,7 +4,6 @@ patchType=$1
 typesPb="types-pb"
 initMysql="mysql"
 initMongodb="mongodb"
-initTidb="tidb"
 initPostgresql="postgresql"
 initSqlite="sqlite"
 
@@ -36,12 +35,6 @@ function generateInitMongodbCode() {
     importPkg
 }
 
-function generateInitTidbCode() {
-    sponge patch gen-db-init --db-driver=tidb --out=./
-    checkResult $?
-    importPkg
-}
-
 function generateInitPostgresqlCode() {
     sponge patch gen-db-init --db-driver=postgresql --out=./
     checkResult $?
@@ -60,15 +53,13 @@ elif [ "$patchType" = "$initMysql" ] || [ "$patchType" == "init-$initMysql" ]; t
     generateInitMysqlCode
 elif [ "$patchType" = "$initMongodb" ] || [ "$patchType" == "init-$initMongodb" ]; then
     generateInitMongodbCode
-elif [ "$patchType" = "$initTidb" ] || [ "$patchType" == "init-$initTidb" ]; then
-    generateInitTidbCode
 elif [ "$patchType" = "$initPostgresql" ] || [ "$patchType" == "init-$initPostgresql" ]; then
     generateInitPostgresqlCode
 elif [ "$patchType" = "$initSqlite" ] || [ "$patchType" == "init-$initSqlite" ]; then
     generateInitSqliteCode
 else
     echo "invalid patch type: '$patchType'"
-    echo "supported types: $initMysql, $initMongodb, $initTidb, $initPostgresql, $initSqlite, $typesPb"
+    echo "supported types: $initMysql, $initMongodb, $initPostgresql, $initSqlite, $typesPb"
     echo "e.g. make patch TYPE=$initMysql"
     echo ""
     exit 1

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ using help:`
`77`	`77`	`},`
`78`	`78`	`}`
`79`	`79`
`80`		`- cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, tidb, sqlite")`
	`80`	`+ cmd.Flags().StringVarP(&sqlArgs.DBDriver, "db-driver", "k", "mysql", "database driver, support mysql, mongodb, postgresql, sqlite")`
`81`	`81`	`cmd.Flags().StringVarP(&sqlArgs.DBDsn, "db-dsn", "d", "", "database content address, e.g. user:password@(host:port)/database. Note: if db-driver=sqlite, db-dsn must be a local sqlite db file, e.g. --db-dsn=/tmp/sponge_sqlite.db") //nolint`
`82`	`82`	`_ = cmd.MarkFlagRequired("db-dsn")`
`83`	`83`	`cmd.Flags().StringVarP(&dbTables, "db-table", "t", "", "table name, multiple names separated by commas")`